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
..
migrate	Merge branch 'master' into follow	2011-05-16 14:56:28 -07:00
seeds	basename vs. dirname fail -.-, sorry my bad	2011-04-08 22:01:10 +02:00
schema.rb	Merge branch 'master' into follow	2011-05-16 14:56:28 -07:00
seeds.rb	Fix db seed, refactor aspect-filters a bunch, fix stream_element a little	2011-04-13 18:13:26 -07:00