diff options
| author | kwadronaut <kwadronaut@leap.se> | 2013-11-24 12:30:07 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2013-11-24 12:30:07 +0100 |
| commit | ff44bc75b814700f65459f990bfb6c078c876483 (patch) | |
| tree | ec42a235c944c31c6886d67baeebe72affb1a4d6 /tags/production.json | |
| parent | 478d964b79d3f72d233fa2e53d2c00dbc6f05a96 (diff) | |
| parent | c73f755a3db36bf9eea411bae91da5e84f158cdc (diff) | |
Merge branch 'develop'
Conflicts:
Leapfile
files/ssh/authorized_keys
Diffstat (limited to 'tags/production.json')
| -rw-r--r-- | tags/production.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tags/production.json b/tags/production.json index 551e323..8212653 100644 --- a/tags/production.json +++ b/tags/production.json @@ -1,5 +1,4 @@ { - "production": true, "ssh": { "port": 4422 } |