[ARVADOS-WORKBENCH2] updated: 1.1.4-615-g8500bc0

[Git user]

Summary of changes:
 src/common/config.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

       via  8500bc0465a1bea55bb6dee5c6b0740cf5dfba8e (commit)
       via  e5ecd847e0a5d64f78ab45194f3b4f2e7fbd199a (commit)
       via  b9d9f71443a149cb99e9dfdbe8a293e52cc6d498 (commit)
      from  c11055f2d6ce8385088bc221eab1175e31777ec0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8500bc0465a1bea55bb6dee5c6b0740cf5dfba8e
Merge: c11055f e5ecd84
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Aug 14 11:56:59 2018 +0200

    Merge branch 'master' into 13990-collection-files-service-based-on-webdav
    
    refs #13990
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>


-----------------------------------------------------------------------


hooks/post-receive
--