History

Jonne Haß bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop Conflicts: Changelog.md		2013-04-10 18:24:47 +02:00
..
cldr
devise
diaspora	preview posts in stream	2013-04-07 17:43:27 +02:00
inflections
javascript	Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop	2013-04-10 18:24:47 +02:00
README.md

Please read the translation guide before contributing!