sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Conversations/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 Make conversations the root project 2014-10-22 15:47:11 -04:00
ManageAccountActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
PublishProfilePictureActivity.java Make conversations the root project 2014-10-22 15:47:11 -04:00
SettingsActivity.java Make conversations the root project 2014-10-22 15:47:11 -04:00
SettingsFragment.java Make conversations the root project 2014-10-22 15:47:11 -04:00
ShareWithActivity.java Make conversations the root project 2014-10-22 15:47:11 -04:00
StartConversationActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
UiCallback.java Make conversations the root project 2014-10-22 15:47:11 -04:00
XmppActivity.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00