bareos-webui: bareos-17.2 edd7bad4

Author Committer Branch Timestamp Parent Ported
frank frank bareos-17.2 2018-01-15 11:18:31 bareos-17.2 a562e5fe Pending
Changeset Merge branch 'bareos-16.2' into bareos-17.2

Resolved Conflicts:

    .travis.yml
    version.txt
mod - tests/selenium/README.md Diff File
mod - tests/selenium/webui-selenium-test.py Diff File