Lukas Reschke 6c6338b810 Merge branch 'master' into implement_712		2016-08-15 21:55:09 +02:00
..
appinfo	adjust federatedfilesharing	2016-08-11 15:13:40 +02:00
css	Add clipboard action to Personal Settings Fed Cloud Id	2016-08-09 14:22:00 +02:00
img	move federated sharing settings to the federatedfilesharing app	2016-04-22 14:55:40 +02:00
js	Merge pull request #780 from nextcloud/copy_fed_cloud_id	2016-08-09 16:18:15 +02:00
l10n	[tx-robot] updated from transifex	2016-08-15 00:12:16 +00:00
lib	adjust federatedfilesharing	2016-08-11 15:13:40 +02:00
templates	change federatedfilesharing css class to followupsection to reduce whitespace	2016-08-13 00:36:32 +02:00
tests	Use MockBuilder instead of createMock	2016-08-15 16:43:22 +02:00
settings-personal.php	Fix apps/	2016-07-21 18:13:57 +02:00