Commit Graph

6 Commits

Author SHA1 Message Date
856fb3bf2e Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Tasks/Admin/Routes/Web/Api.php
2016-10-02 12:10:19 +02:00
9500ba9f76 Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
2876f490f8 Preparing for query extension
implementing media for task/task elements and preparing for unit parent
display.
2016-09-28 22:07:54 +02:00
0e0ff86bfd Making datamapper static 2016-05-14 14:58:33 +02:00
ae336cfe4a Organization + calendar fixes/extensions 2016-02-14 23:10:58 +01:00
6009d573e4 Renaming business to organization 2016-02-04 18:43:37 +01:00