oms-Accounting/Theme/Backend
Dennis Eichhorn 2c732d4062 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php
2017-01-26 16:42:29 +01:00
..
Lang Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
account-list.tpl.php Localization fix 2016-07-27 22:20:30 +02:00
entries.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
gl-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
gl-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
gl-profile.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
journal-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
stack-archive-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
stack-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
stack-entries.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
stack-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
stack-predefined-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00