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/phnompenh.json | |
| parent | 478d964b79d3f72d233fa2e53d2c00dbc6f05a96 (diff) | |
| parent | c73f755a3db36bf9eea411bae91da5e84f158cdc (diff) | |
Merge branch 'develop'
Conflicts:
Leapfile
files/ssh/authorized_keys
Diffstat (limited to 'tags/phnompenh.json')
| -rw-r--r-- | tags/phnompenh.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tags/phnompenh.json b/tags/phnompenh.json new file mode 100644 index 0000000..f9f243c --- /dev/null +++ b/tags/phnompenh.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Phnom Penh", + "country_code": "KH", + "timezone":"+7", + "hemisphere": "N" + } +} |