Jingga/oms-SalesAnalysis
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-SalesAnalysis.git synced 2026-01-11 19:38:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4b50c6937f
oms-SalesAnalysis/Theme/Backend/Lang
History
Dennis Eichhorn 4b50c6937f 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
..
api.en.lang.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
en.lang.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Navigation.en.lang.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00