Jingga/oms-Purchase
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Purchase.git synced 2026-01-23 04:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8a031bdca1
oms-Purchase/Theme/Backend
History
Dennis Eichhorn 8a031bdca1 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
analysis-dashboard.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
article-create.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
article-list.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
article-order-pending-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
article-order-suggestion.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
article-single.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
invoice-archive.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
invoice-create.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
invoice-list.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
invoice-single.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00