3 commits

Author	SHA1	Message	Date
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
Florian Staudacher	8eb70c8a80	use app.models.Stream instead of app.models.Photos, ... change naming a bit to be more general since its posts+photos now (re #3158)	2012-04-18 20:20:56 +02:00
Florian Staudacher	cab953848f	added tests for photos page	2012-02-09 23:12:39 +01:00