Rubén D ccc7ce9cfa Merge branch '3.0' into v3.0 ...

Conflicts:
	app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php
	app/modules/web/Controllers/Helpers/Grid/TrackGrid.php
	public/js/app-actions.js
	public/js/app-actions.min.js

2019-01-24 11:39:28 +01:00

..

backup

* [ADD] Work in progress

2017-10-17 02:00:53 +02:00

cache

* [ADD] Work in progress

2017-10-17 02:00:53 +02:00

config

* [MOD] Moved non-configuration files from config to resources directory

2018-11-12 08:29:18 +01:00

locales

* [MOD] Updated translations. Thanks to all contributors!

2018-12-16 13:23:20 +01:00

modules

Merge branch '3.0' into v3.0

2019-01-24 11:39:28 +01:00

resources

* [MOD] Moved non-configuration files from config to resources directory

2018-11-12 08:29:18 +01:00

temp

* [ADD] Work in progress

2017-10-17 02:00:53 +02:00