Lukas Reschke 3ad89a76b5 Resolve conflict		2016-08-16 21:09:31 +02:00
..
additional.php	Fallback for legacy settings. They are placed into Additional Settings	2016-08-16 21:04:41 +02:00
encryption.php	Initial work on Apps page split:	2016-08-16 21:04:22 +02:00
frame.php	Initial work on Apps page split:	2016-08-16 21:04:22 +02:00
logging.php	Initial work on Apps page split:	2016-08-16 21:04:22 +02:00
server.php	Resolve conflict	2016-08-16 21:09:31 +02:00
sharing.php	Initial work on Apps page split:	2016-08-16 21:04:22 +02:00
tipstricks.php	Initial work on Apps page split:	2016-08-16 21:04:22 +02:00