Merge branch 'pu/2013.10-changerole'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:09:45 +0000 (19:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:09:45 +0000 (19:09 +0200)
commitd92ee6e5e4d5c2d5cd05083b53752b31a136d43e
tree648288eb424a163acdf72843ecc605c3389e8199
parentf6fb951638319bf1e896d5d9257d35e67c48518b
parent4521d3ba45ea8d7e3284e2ca9e9fefadd2337ebb
Merge branch 'pu/2013.10-changerole'

Conflicts:
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot

Change-Id: I19c9020cbe2f68d7b30d4cc4aa69a372e935892f
tine20/Tinebase/Config.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/css/Tinebase.css
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot