From 14ade63199793632017815dbbaeadfb0484d1c10 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 15:24:31 +0530 Subject: [PATCH] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java --- GSKMTOrange/src/main/res/values-tr/string.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 117407d..89d61fd 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -16,6 +16,7 @@ Günlük Veri Indir Veri Paylaş Coğrafi Konum + Data Export Çıkış Ayarlar Hizmetler