Rubén D a2ecef2141 Merge branch 'master' into v3.1 ...

# Conflicts:
#	.travis.yml
#	lib/SP/Services/Install/Installer.php

2019-01-26 13:12: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 'master' into v3.1

2019-01-26 13:12: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