Juan Salvador Pérez García 92c0e34c7a Fixed error in layout ...

An error was introduced while trying to fix merge conflicts. It is fixed
now.

2018-10-01 10:13:45 +02:00

..

assets

Merge branch 'dashboard' into rebase_consul_master

2018-09-27 09:18:27 +02:00

controllers

Merge branch 'dashboard' into rebase_consul_master

2018-09-27 09:18:27 +02:00

helpers

Merge branch 'dashboard' into rebase_consul_master

2018-09-27 09:18:27 +02:00

mailers

Fixes #229

2018-07-25 13:28:44 +02:00

models

Merge branch 'dashboard' into rebase_consul_master

2018-09-27 09:18:27 +02:00

views

Fixed error in layout

2018-10-01 10:13:45 +02:00