conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Contact details translations + update spanish translations	kruks23	2014-05-22	1	-1/+15
\|
*	Update Spanish Translations + harcoded just_now	kruks23	2014-05-20	1	-6/+8
\|
*	Update Spanish Translations	kruks23	2014-05-18	1	-3/+8
\|
*	Update Spanish Translations + harcoded pref_advanced_settings	kruks23	2014-05-16	1	-0/+32
\|
*	Update Spanish Translations	kruks23	2014-05-14	1	-3/+14
\|
*	Preferences Spanish Translations	kruks23	2014-05-12	1	-0/+28
\|
*	Delete styles.xml	kruks23	2014-05-10	1	-19/+0
\|
*	Merge remote-tracking branch 'origin/development' into development	kruks23	2014-05-10	1	-0/+19
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: res/values-es/arrays.xml res/values-es/strings.xml
\| *	#79 First translation into spanish.	kruks23	2014-05-06	3	-0/+127
\|
*	Translation into spanish.	kruks23	2014-05-10	2	-52/+42
\|
*	#79 First translation into spanish.	kruks23	2014-05-10	1	-0/+19
\|
*	Update basque and spanish translations	Beriain	2014-05-06	3	-45/+1
\|
*	Add Basque and Spanish translations	Mikel	2014-05-02	4	-0/+152