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	-1/+9
\|\
\| *	use app name in resource suggestions	Daniel Gultsch	2016-05-03	1	-1/+1
\| *	expert setting to manually change presence	Daniel Gultsch	2016-04-22	1	-0/+8
* \|	Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4	lookshe	2016-02-16	1	-0/+6
\|\\|
\| *	allow user to set MAM preferences	Daniel Gultsch	2016-02-09	1	-0/+6
* \|	Unused preference 'picture_compression'. This feature is configured in our va...	steckbrief	2016-02-13	1	-12/+0
* \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-0/+12
\|\\|
\| *	let the user decide on whether or not to compress pictures	Daniel Gultsch	2016-01-09	1	-0/+12
\| *	added choose picture as another quick action. fixes #1221	Daniel Gultsch	2015-05-26	1	-0/+2
\| *	replace send button with quick action button as long as no text has been entered	Daniel Gultsch	2015-05-02	1	-0/+15
* \|	Implements FS#24: Introduce setting for picture resizing	steckbrief	2015-10-30	1	-1/+10
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-0/+18
* \|	changed received and read confirmation setting to one list and put it to sett...	lookshe	2015-04-14	1	-0/+12
\|/
*	make project translatable via transifex	Daniel Gultsch	2015-01-09	1	-6/+6
*	added higher auto accept file sizes	Daniel Gultsch	2015-01-04	1	-33/+37
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-2/+2
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+39