PeterCxy/cheogram
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
cheogram/src/main/java/eu/siacs/conversations/ui
History
Sam Whited 46f147a82c Merge branch 'gradle' into development 
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
..
adapter Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
ChooseContactActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
ConferenceDetailsActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
ContactDetailsActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
ConversationActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
ConversationFragment.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
EditAccountActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
EditMessage.java
ManageAccountActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
PublishProfilePictureActivity.java
SettingsActivity.java
SettingsFragment.java
ShareWithActivity.java
StartConversationActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
UiCallback.java
XmppActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00