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	add Armenian pluralization rule	2013-01-03 23:32:50 +01:00
devise	Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca into develop	2013-02-17 14:08:39 +01:00
diaspora	preview posts in stream	2013-04-07 17:43:27 +02:00
inflections	Updated readme.	2012-04-27 16:28:24 +05:30
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!