PiratX - The new way for communications

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'siacs/master' into development	Christian S	2016-02-14	1	-0/+6
\|\
\| *	allow user to set MAM preferences	Daniel Gultsch	2016-02-09	1	-0/+6
\| \|
* \|	Merge branch 'siacs/master' into development	Christian S	2016-01-10	1	-0/+12
\|\\|
\| *	let the user decide on whether or not to compress pictures	Daniel Gultsch	2016-01-09	1	-0/+12
\| \|
* \|	Update arrays.xml	Christian S	2015-11-25	1	-2/+2
\|/ \| \| \|	* changed file size for never from 0 to 1 to show the download button instead of link * changed resource Conversations to Pix-Art Messender
*	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
\|
*	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
\| \| \| \|	also changed labeling to MiB and KiB
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+39