Jingga/oms-Profile
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Profile.git synced 2026-01-11 15:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48ed64a02f
oms-Profile/Admin
History
Dennis Eichhorn 48ed64a02f 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
..
Install Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Routes Implemented application routes 2016-07-22 00:15:26 +02:00
Activate.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Deactivate.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Installer.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Uninstall.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Update.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00