Jingga/oms-ResearchDevelopment
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ResearchDevelopment.git synced 2026-01-24 11:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42 Commits 2 Branches 0 Tags 508 KiB
547b28a582
Commit Graph

4 Commits

Author SHA1 Message Date
Dennis Eichhorn
863cf9348d 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
Dennis Eichhorn
8bb7d0377b Adjusting copyright 2017-01-26 16:32:45 +01:00
Dennis Eichhorn
6e42eb46de Increase php version requirement 2016-12-07 20:56:15 +01:00
Dennis Eichhorn
e9d4968b26 Case fix! 2016-03-26 18:59:38 +01:00