Files
quik/QKSMS
l3d00m fe96a59144 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:

	QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java
	QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java
2015-08-24 15:00:25 +02:00
..
2015-08-22 20:01:09 -07:00