Björn Schießle 54eeb8b8fc fix merge conflict		2013-01-31 10:55:59 +01:00
..
ajax	…
appinfo	fix merge conflict	2013-01-31 10:55:59 +01:00
css	…
js	…
l10n	…
lib	…
templates	…
history.php	…
settings.php	…