conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-2/+23
\|\
\| *	clear password field before setting new one	Daniel Gultsch	2016-05-04	1	-0/+1
\| *	fixed npe when calling changepassword activity directly	Daniel Gultsch	2016-05-04	1	-2/+4
\| *	prevent user from accidentally changing password after using magic create	Daniel Gultsch	2016-04-26	1	-2/+20
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-6/+3
\|\ \
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-2/+4
\|\\| \|
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-110/+0
* \| \|	Imports organized	steckbrief	2016-02-12	1	-2/+0
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-9/+5
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	use extract account from intent method and final EXTRA_ACCOUNT variable	Daniel Gultsch	2016-01-22	1	-8/+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
* \|	no trim of messages or password	lookshe	2015-04-11	1	-3/+6
\|/
*	migrated change password into separate activity	Daniel Gultsch	2015-01-03	1	-0/+107