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

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

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

..

admin.js

[Web] Lang updates

2019-02-05 10:37:28 +01:00

debug.js

[Web] Update bootstrap slider javascript

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

edit.js

[Web] Minify css and js via PHP

2019-01-30 12:10:26 +01:00

index.js

[Web] Minify css and js via PHP

2019-01-30 12:10:26 +01:00

mailbox.js

Merge branch 'master' into admin-login

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

quarantine.js

Quarantine - Enhanced JS + Show btn fix event binding

2019-03-12 21:56:59 +01:00

user.js

[Web] Minify css and js via PHP

2019-01-30 12:10:26 +01:00