Marcel Hofer 7d2289c3a7 Merge branch 'master' into admin-login ...

# Conflicts:
#	data/web/js/site/mailbox.js

2019-03-23 21:17:02 +01:00

..

build

[Web] Update bootstrap slider javascript

2019-02-05 00:07:34 +01:00

site

Merge branch 'master' into admin-login

2019-03-23 21:17:02 +01:00