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
..
_debug.haml	Remove some old views, clean up routes, clean up.	2010-12-01 15:38:56 -08:00
_header.html.haml	pulled new aspect into modal window	2011-05-13 11:58:18 -07:00
application.html.haml	update login page	2011-05-13 22:05:35 -07:00
application.mobile.haml	misc visual cleanup on mobile	2011-05-13 23:33:16 -07:00
notifier.html.haml	cleaned up craziness in users and likes routing, fixed #961	2011-03-24 03:02:14 +01:00
notifier.text.haml	cleaned up craziness in users and likes routing, fixed #961	2011-03-24 03:02:14 +01:00