Michael Vogel 8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default ... Conflicts: mod/admin.php		2015-02-08 13:26:28 +01:00
..
bg
ca
cs	CS DE FR: update to the strings	2015-02-05 11:06:23 +01:00
de	CS DE FR: update to the strings	2015-02-05 11:06:23 +01:00
en/smarty3
eo
es
fr	FR update for the strings	2015-02-08 10:44:47 +01:00
is
it
nb-no
nl
pl
pt-br
ro
ru
smarty3
sv
templates	Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default	2015-02-08 13:26:28 +01:00
theme	Some diabook features can dramatically slow down the system. There is a new switch to disable this.	2015-02-03 19:59:47 +01:00
zh-cn
.htaccess
custom_tinymce.css
default.php
global.css
minimal.php