vanitasvitae d2cf0d8a4c Merged and moved french translation. Removed unused strings		2016-06-24 13:06:18 +02:00
..
java/com/github/dfa/diaspora_android	Merge remote-tracking branch 'origin/master' into rework_settings	2016-06-24 12:40:56 +02:00
res	Merged and moved french translation. Removed unused strings	2016-06-24 13:06:18 +02:00
AndroidManifest.xml	Moved pod settings to SettingsActivity	2016-06-18 15:53:49 +02:00