diff options
| author | Micah Anderson <micah@leap.se> | 2014-05-24 11:40:52 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-05-24 11:40:52 -0400 |
| commit | 1585d3694c6c021a11f8363290a57261f5ee4c2b (patch) | |
| tree | 6180b2de39b6ea76914873f42e4875440b1557ec /provider_base/files/service-definitions/provider.json.erb | |
| parent | a622e49c5df2150049afb6f6ed47177537b7e6da (diff) | |
| parent | 27f0d5731593e3a305dbfb315804294960ad204e (diff) | |
Merge remote-tracking branch 'cz8s/feature/allow_webapp_and_mx_on_one_host' into develop
Diffstat (limited to 'provider_base/files/service-definitions/provider.json.erb')
0 files changed, 0 insertions, 0 deletions