Joas Schilling c0a8942764 Fix missing conflict resolutions ... Signed-off-by: Joas Schilling <coding@schilljs.com>		2017-04-26 17:05:59 +02:00
..
composer	Merge branch 'master' into contactsmenu	2017-04-26 00:50:38 +02:00
l10n	[tx-robot] updated from transifex	2017-04-26 00:07:43 +00:00
private	Fix missing conflict resolutions	2017-04-26 17:05:59 +02:00
public	Fix missing conflict resolutions	2017-04-26 17:05:59 +02:00
autoloader.php	Revert "Add a magic wrapper to allow phpunit4 to run the code again "	2017-03-20 14:25:43 +01:00
base.php	Add activities when email or password is changed	2017-04-13 11:13:19 +02:00