Michael Vogel 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework ... Conflicts: mod/contacts.php mod/crepair.php		2015-12-03 14:38:04 +01:00
..
bg	…
ca	…
cs	…
de	DE translations THX Abrax	2015-12-01 13:56:23 +01:00
eo	…
es	…
fonts	…
fr	…
install	…
is	…
it	…
nb-no	…
nl	…
pl	…
pt-br	…
ro	…
ru	…
smarty3	…
sv	…
templates	Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework	2015-12-03 14:38:04 +01:00
theme	Merge pull request #2131 from rabuzarus/3011_hcard_vcard	2015-12-03 14:16:52 +01:00
zh-cn	…
.htaccess	…
custom_tinymce.css	…
default.php	…
global.css	…
minimal.php	…