Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2020-11-08 11:38:37 +01:00
commit c94b917d13
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "rainbox.email", "name": "rainbox.email",
"version": "2.1.0", "version": "2.1.1",
"description": "ISP mail provider manager with mysql and integrated LDAP server", "description": "ISP mail provider manager with mysql and integrated LDAP server",
"repository": "https://gitlab.com/ArisuOngaku/rainbox.email", "repository": "https://gitlab.com/ArisuOngaku/rainbox.email",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

View File

@ -137,12 +137,12 @@ export default class App extends Application {
this.use(new BackendController()); this.use(new BackendController());
this.use(new MailboxBackendController()); this.use(new MailboxBackendController());
this.use(new AuthController()); this.use(new AuthController());
this.use(new MailAutoConfigController()); // Needs to override MailController
// Core functionality // Core functionality
this.use(new MailController()); this.use(new MailController());
// Other functionnality // Other functionnality
this.use(new MailAutoConfigController());
// Semi-static routes // Semi-static routes
this.use(new HomeController()); this.use(new HomeController());