Merge branch 'develop'

Conflicts:
	Leapfile
	files/ssh/authorized_keys

1 files changed, 9 insertions, 0 deletions

diff --git a/tags/istanbul.json b/tags/istanbul.json
new file mode 100644
index 0000000..de48db8
--- /dev/null
+++ b/tags/istanbul.json
@@ -0,0 +1,9 @@
+{
+  "location": {
+    "name": "Istanbul",
+    "country_code": "TR",
+    "timezone": "+2",
+    "hemisphere": "N"
+  },
+  "enabled": "= environment != 'production'" 
+}