Merge remote-tracking branch 'origin/GeoT' into GeoT

# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
2017-01-06 11:42:14 +05:30
parent 852c6f61e5
commit 83e6be733b
22 changed files with 1137 additions and 267 deletions
@@ -109,6 +109,15 @@
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme.NoActionBar"></activity>

+        <activity
+            android:name=".dailyentry.NonWorkingReason"
+            android:label="@string/title_activity_t2_pcompliance"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"></activity>
+
+
+
+
    </application>

 </manifest>