Merge branch 'master' into 6663-git-server
authorTom Clegg <tom@curoverse.com>
Mon, 3 Aug 2015 19:50:28 +0000 (15:50 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 3 Aug 2015 19:50:28 +0000 (15:50 -0400)
commit7e773735e9d547381a77baeeb139696dfa66a7a6
treefe64514b63794fed8040549abc56a0702e886077
parent97fa1e269cf5d33365d76fcdc6ec3f6734b0f468
parent15c86f88f1f5124c082e77dedd0b97c5efc93388
Merge branch 'master' into 6663-git-server

Conflicts:
doc/install/install-api-server.html.textile.liquid
doc/install/install-api-server.html.textile.liquid
services/api/config/application.default.yml