Morris Jobke 90d8070da3 Merge branch 'master' into clean-settings-layout		2017-08-04 11:11:33 +02:00
..
Activity	Use PNG version of the icons for shipped activities	2017-06-20 13:48:51 +02:00
BackgroundJobs	Add |null to PHPDoc	2017-08-01 08:20:15 +02:00
Controller	Use public API instead of private	2017-08-01 18:19:28 +02:00
Mailer	Also use IMailer interface to generate the email template	2017-06-06 10:47:48 -05:00
Middleware	Remove explicit type hints for Controller	2017-08-01 17:32:03 +02:00
ajax	Some app fixes of phpstorm inspections	2017-07-24 11:42:07 +02:00
css	Fix federation icon menu and container paddings.	2017-08-04 10:22:03 +02:00
img	Use PNG version of the icons for shipped activities	2017-06-20 13:48:51 +02:00
js	Merge branch 'master' into clean-settings-layout	2017-08-04 11:11:33 +02:00
l10n	[tx-robot] updated from transifex	2017-08-03 00:08:06 +00:00
templates	Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout	2017-08-04 10:23:52 +02:00
tests/js	Fix JSUnit tests	2017-01-13 18:33:43 +01:00
Application.php	Change 2FA activities to more generic security activities	2017-05-18 22:10:57 +02:00
Hooks.php	Stricter phan config fixes	2017-08-01 08:20:13 +02:00
help.php	Update with robin	2016-07-21 18:13:58 +02:00
routes.php	completing PersonalInfo	2017-06-23 12:36:37 +02:00
users.php	Return '0' instead of null	2017-08-01 08:20:15 +02:00