danielgrippi e379a6df0f Merge branch 'master' into stream-for-photos ... Conflicts: app/assets/javascripts/app/views/stream_view.js		2012-04-18 18:30:54 -07:00
..
images	bootstrap-sass	2012-04-11 06:16:01 -07:00
javascripts	Merge branch 'master' into stream-for-photos	2012-04-18 18:30:54 -07:00
stylesheets	add/remove hidden class for pagination instead of manipulating HTML contents on every page load.	2012-04-18 10:27:22 -07:00
templates	Update aspects dropdown to say number of selected aspects	2012-04-13 17:49:49 -07:00