conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Imports organized	steckbrief	2016-02-12	1	-3/+1
*	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-24/+74
\|\
\| *	use extract account from intent method and final EXTRA_ACCOUNT variable	Daniel Gultsch	2016-01-22	1	-1/+1
\| *	implement direct sharing in android 6.0. fixes #1321	Daniel Gultsch	2015-12-07	1	-23/+64
\| *	check availabiltiy of pgp before sharing files	Daniel Gultsch	2015-12-05	1	-0/+4
\| *	Ensure uris is empty before onStart adds to it	Andreas Straub	2015-09-02	1	-0/+1
\| *	rely on refreshUi/refreshUiReal and make sure it is being used everywhere	Daniel Gultsch	2015-07-20	1	-0/+4
\| *	Optimize imports	Andreas Straub	2015-07-20	1	-1/+0
\| *	fixed share with activity to account for http file upload	Daniel Gultsch	2015-07-02	1	-40/+34
\| *	allow sharing multiple images at once. fixes #1090	iNPUTmice	2015-04-11	1	-19/+35
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	1	-29/+34
\|\ \
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-222/+0
\| \|/
* /	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-57/+67
\|/
*	fixed bug when sharing files from google drive	iNPUTmice	2015-01-18	1	-7/+11
*	fixed potential NPEs in ShareWithActivity	Daniel Gultsch	2015-01-06	1	-4/+5
*	record voice and attachment refactor	Daniel Gultsch	2015-01-03	1	-3/+10
*	Add support for XEP-0191 (Blocking command)	Sam Whited	2014-12-22	1	-2/+2
*	properly detect images in share with	iNPUTmice	2014-12-17	1	-6/+6
*	Allow sending of any filetype via intent	Sam Whited	2014-12-15	1	-24/+36
*	Update more files to use JID objects	Sam Whited	2014-11-09	1	-5/+18
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+185