Arthur Schiwon 717e22267a Merge branch 'master' into implement_712		2016-08-16 18:31:59 +02:00
..
appinfo	adjust federation app	2016-08-11 18:53:45 +02:00
css	Padding of federated server	2016-08-09 14:42:01 +02: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-08-16 00:10:47 +00:00
lib	adjust federation app	2016-08-11 18:53:45 +02:00
templates	Use proper branding	2016-07-21 02:24:36 +02:00
tests	Use MockBuilder instead of createMock	2016-08-15 16:43:22 +02:00