diff options
| author | Micah Anderson <micah@riseup.net> | 2013-07-09 16:43:39 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-07-09 16:43:39 +0100 |
| commit | b4077083b971377636754b2988668a6ddd384da5 (patch) | |
| tree | b8e358b5f0f6dfa882d31d7446266111bc0d201b /provider_base/tags/local.json | |
| parent | 625aaa11138bba365958391664299692402f8da4 (diff) | |
| parent | 672154a8322901b86c9882854234eae53221a38e (diff) | |
Merge remote-tracking branch 'origin/develop'0.2.2
Conflicts:
provider_base/services/webapp.json
Diffstat (limited to 'provider_base/tags/local.json')
| -rw-r--r-- | provider_base/tags/local.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/provider_base/tags/local.json b/provider_base/tags/local.json index 9cb16602..48312b33 100644 --- a/provider_base/tags/local.json +++ b/provider_base/tags/local.json @@ -1,3 +1,3 @@ { - "local": true + "environment": "local" }
\ No newline at end of file |