bareos-webui: master 326664fa

Author Committer Branch Timestamp Parent
frank frank master 2013-11-21 13:55 master a63ee443 Pending
Changeset Merge branch 'barbossa-0.0.1'

Conflicts:
    .travis.yml
mod - .travis.yml Diff File
mod - module/Dashboard/src/Dashboard/Controller/DashboardController.php Diff File
mod - module/Dashboard/view/dashboard/dashboard/index.phtml Diff File
mod - module/Job/src/Job/Model/JobTable.php Diff File