conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/development' into fix_typo	Michael	2014-08-30	9	-167/+364
\|\
\| *	version bump to 0.7-alpha	iNPUTmice	2014-08-30	1	-2/+2
\| *	Merge branch 'sm' into development	iNPUTmice	2014-08-30	3	-146/+250
\| \|\
\| \| *	reset unsend messages to waiting	iNPUTmice	2014-08-30	2	-2/+17
\| \| *	properly set stanza count on session resume	iNPUTmice	2014-08-30	1	-3/+21
\| \| *	basic message acking	iNPUTmice	2014-08-30	3	-131/+200
\| * \|	proper namespaces for xep-0352	iNPUTmice	2014-08-30	3	-3/+3
\| * \|	send inactive or active on every connect and resume	iNPUTmice	2014-08-30	1	-3/+10
\| * \|	added basic csi	iNPUTmice	2014-08-30	4	-0/+86
\| \|/
\| *	version bump to 0.6 with changelogs0.6	iNPUTmice	2014-08-30	3	-31/+27
\| *	brought npe catcher back for kxml parser	iNPUTmice	2014-08-30	1	-0/+4
* \|	Merge remote-tracking branch 'upstream/development' into fix_typo	Michael	2014-08-29	9	-26/+37
\|\\|
\| *	fixed link to old resource	iNPUTmice	2014-08-29	1	-2/+2
\| *	fixed npe	iNPUTmice	2014-08-29	1	-0/+4
\| *	more swedish translations	iNPUTmice	2014-08-29	1	-0/+3
\| *	fixed #389	iNPUTmice	2014-08-29	6	-6/+10
\| *	Merge pull request #394 from suraia/translation-de	Daniel Gultsch	2014-08-29	1	-19/+19
\| \|\
\| \| *	Fix some typos in the German translation.	Michael Kuhn	2014-08-28	1	-19/+19
\| \|/
* /	fix forgotten spelling.	Michael	2014-08-28	1	-4/+4
\|/
*	fixed spelling thanks @betheg	iNPUTmice	2014-08-28	8	-67/+63
*	formating in strings file	iNPUTmice	2014-08-28	1	-3/+3
*	Merge branch 'development' of https://github.com/beriain/Conversations into d...	iNPUTmice	2014-08-28	1	-12/+20
\|\
\| *	Update strings.xml	Aitor Beriain	2014-08-27	1	-20/+20
* \|	translated missing string in settings	iNPUTmice	2014-08-27	5	-44/+39
* \|	added swedish translations by Anders Sandblad @andersruneson	iNPUTmice	2014-08-27	1	-1/+24
* \|	added missing string to german translation	iNPUTmice	2014-08-26	1	-0/+1
* \|	Merge pull request #385 from rostovtsev/development	Daniel Gultsch	2014-08-26	1	-23/+59
\|\ \
\| * \|	Updated to 0.6.1	Ilia	2014-08-26	1	-23/+59
\|/ /
* \|	Merge pull request #384 from wapolinar/typos	Daniel Gultsch	2014-08-26	1	-11/+11
\|\ \
\| * \|	Typos in readme.	Wolfgang Apolinarski	2014-08-26	1	-11/+11
\|/ /
* \|	removed deprecated strings from translations	iNPUTmice	2014-08-26	6	-49/+1
* \|	Merge pull request #376 from wapolinar/development	Daniel Gultsch	2014-08-25	1	-1/+1
\|\ \
\| * \|	Update strings.xml	wapolinar	2014-08-25	1	-1/+1
* \| \|	Merge pull request #377 from kruks23/translation2	Daniel Gultsch	2014-08-25	1	-11/+6
\|\ \ \
\| * \| \|	Update Spanish Translations	kruks23	2014-08-25	1	-11/+6
\|/ / /
* / /	fixing duplicate private muc messages	iNPUTmice	2014-08-25	1	-3/+10
\|/ /
* \|	fixed message hint	iNPUTmice	2014-08-25	1	-51/+61
* \|	fixed faulty db creation on first install	iNPUTmice	2014-08-24	1	-9/+12
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	Daniel Gultsch	2014-08-24	1	-11/+12
\|\ \
\| * \	Merge pull request #375 from kriztan/patch-2	Daniel Gultsch	2014-08-24	1	-11/+12
\| \|\ \
\| \| * \|	Update strings.xml	kriztan	2014-08-24	1	-11/+12
\| \|/ /
* \| \|	use otr encrypiton instead of plain when contact has exactly one online prese...	Daniel Gultsch	2014-08-24	1	-0/+10
* \| \|	jump right into edit account if now accounts are configured	Daniel Gultsch	2014-08-23	3	-10/+19
* \| \|	changed workflow on inital avatar publication	Daniel Gultsch	2014-08-23	3	-11/+40
\|/ /
* \|	experimental muc message deduplication	Daniel Gultsch	2014-08-23	3	-2/+25
* \|	removed server compat value in favor of a (small xep list)	Daniel Gultsch	2014-08-23	4	-177/+187
* \|	Merge pull request #373 from kruks23/translation1	Daniel Gultsch	2014-08-23	1	-3/+10
\|\ \
\| * \|	Update Spanish Translations	kruks23	2014-08-21	1	-3/+10
* \| \|	fixed another npe	iNPUTmice	2014-08-22	1	-7/+10
* \| \|	tiny redesign for private muc messages	iNPUTmice	2014-08-22	3	-23/+31
\|/ /