danielgrippi 7eaca0346c Merge branch 'master' into follow ... Conflicts: config/assets.yml public/stylesheets/sass/_mixins.scss spec/models/user/posting_spec.rb		2011-05-16 14:56:28 -07:00
..
blueprint	broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed	2011-05-11 18:33:17 -07:00
sass	Merge branch 'master' into follow	2011-05-16 14:56:28 -07:00
vendor	bunch of small mobile ui fixes	2011-03-31 23:38:38 -07:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00