WolverinDEV 3f907c627d Merge remote-tracking branch 'remotes/origin/master' into react-tree ... # Conflicts: # shared/js/ui/modal/permission/HTMLPermissionEditor.ts		2020-04-01 15:37:15 +02:00
..
templates/modal	Fixed the teaclient	2020-03-27 23:53:17 +01:00
index.php	Refactored the app to use webpack	2020-03-30 13:44:18 +02:00
manifest.json	save	2019-08-31 18:31:01 +02:00
templates.html	Merge remote-tracking branch 'remotes/origin/master' into react-tree	2020-04-01 15:37:15 +02:00