Roland Gruber 9086f5847e Merge remote-tracking branch 'origin/develop' into webauthn ... Conflicts: lam/locale/de_DE/LC_MESSAGES/messages.mo lam/locale/de_DE/LC_MESSAGES/messages.po		2019-12-09 20:13:09 +01:00
..
selfService	.gitignore	2016-03-26 15:02:04 +01:00
templates	custom base type	2017-12-30 17:07:49 +01:00
.gitignore	webauthn: store registrations, check for duplicate security keys	2019-12-01 18:11:19 +01:00
.htaccess	drop Apache 2.2 support	2018-08-11 14:57:05 +02:00
addressbook.conf.sample	new settings	2018-03-04 10:10:53 +01:00
config.cfg.sample	renamed abc_sample to abc.sample	2014-07-12 14:23:41 +00:00
language	deactivated outdated translations	2019-12-07 13:32:20 +01:00
samba3.conf.sample	new settings	2018-03-04 10:10:53 +01:00
unix.conf.sample	new settings	2018-03-04 10:10:53 +01:00
windows_samba4.conf.sample	new settings	2018-03-04 10:10:53 +01:00