Roland Gruber 01844a0d05 Merge remote-tracking branch 'remotes/origin/develop' into configImportExport ... # Conflicts: # lam/lib/selfService.inc		2020-06-14 21:36:48 +02:00
..
lib	Merge remote-tracking branch 'remotes/origin/develop' into configImportExport	2020-06-14 21:36:48 +02:00
resources/pdf	new PDF writing API	2017-07-02 09:00:14 +02:00
utils	allow to set a display name for the server	2016-01-03 10:56:57 +00:00