conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\|\
\| *	Fixes FS#168 - Not possible to share more than one picture at once	lookshe	2016-03-20	1	-59/+83
\| \|
* \|	fixed merge errors	lookshe	2016-03-20	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	1	-6/+3
\|\\|
\| *	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	1	-6/+3
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	1	-1/+3
\|\\| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
\| *	Fixes FS#158: user decision dialog heading configurable and translateable	steckbrief	2016-03-10	1	-1/+2
\| \|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-11/+12
\| \|\ \| \|/ \|/\|
* \|	Imports organized	steckbrief	2016-02-12	1	-1/+0
\| \|
* \|	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-6/+7
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	1	-2/+91
\|\\|
\| *	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	1	-2/+90
\| \| \| \| \| \| \| \|	distinguishes between image resizing and compressing/saving
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	1	-6/+6
\|/
*	Implements FS#26: Introduction of dialog to choose whether to resize a ↵	steckbrief	2015-11-03	1	-0/+97
	picture or not