kjac d9ffb4b097 Merge remote-tracking branch 'refs/remotes/origin/master' into publishing ...

# Conflicts:
#	app/less/archetype.less

2016-04-03 12:53:30 +02:00

..

config.controller.js

Fix issue 342

2016-03-31 23:44:52 +02:00

config.dialog.controller.js

Fix issue 342

2016-03-31 23:44:52 +02:00

controller.js

Revert addDefaultProperties to master and adjust addCustomProperties accordingly

2016-03-23 08:38:07 +01:00