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
..
collections
forms
helpers	moved non-ascii url markdown tests to text_formatter_spec, added test case + fix	2012-04-16 23:41:05 +02:00
models	use app.models.Stream instead of app.models.Photos,	2012-04-18 20:20:56 +02:00
pages
views	Merge branch 'master' into stream-for-photos	2012-04-18 18:30:54 -07:00
app_spec.js
views_spec.js	update schema, views spec	2012-04-13 18:32:35 -07:00