Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk

# Conflicts: # GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
2017-01-25 10:47:58 +05:30
parent c5efee08d6
commit 16bdac6be1
5 changed files with 7 additions and 8 deletions
@@ -150,6 +150,7 @@
            android:name=".upload.UploadActivity"
            android:configChanges="screenSize|orientation|keyboardHidden"
            android:label="@string/title_activity_upload"
+            android:theme="@style/AppTheme.NoActionBar"
            android:screenOrientation="portrait" />
        <activity
            android:name=".dailyentry.SettingsActivity"