Lukas Reschke 179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream		2016-07-01 11:36:35 +02:00
..
appinfo	fix federation strings	2016-06-20 13:13:37 +02:00
css	Fixed problem about removing trusted servers accidentally	2016-06-08 09:02:05 +00:00
img	add icon for Federation app	2015-11-25 16:06:36 +01:00
js	Changed global variable to local	2016-06-17 07:35:23 +00:00
l10n	[tx-robot] updated from transifex	2016-06-28 01:57:10 -04:00
lib	fix federation strings	2016-06-20 13:13:37 +02:00
settings	Add app:check-code for already compatible apps	2016-06-27 16:50:10 +02:00
templates	fix federation strings	2016-06-20 13:13:37 +02:00
tests	fix federation strings	2016-06-20 13:13:37 +02:00