Adolfo Gómez García b0a6807ea4 Merge remote-tracking branch 'origin/v1.9' ... # Conflicts: # VERSION # actors/linux/build-packages.sh # actors/linux/debian/changelog # actors/linux/debian/files # client/linux/debian/changelog # client/linux/debian/files		2016-03-14 12:16:52 +01:00
..
.externalToolBuilders	* Fixed another bug introduced with new transactions on Django 1.6	2013-12-11 09:59:17 +00:00
documentation	* Fixed several bad formed literal strings	2015-02-02 11:31:59 +01:00
samples	fixed RDP with user credentials	2015-04-21 12:29:10 +02:00
src	Merge remote-tracking branch 'origin/v1.9'	2016-03-14 12:16:52 +01:00
templates	Merge remote-tracking branch 'origin/v1.9'	2016-03-14 12:16:52 +01:00
.project	* Fixed another bug introduced with new transactions on Django 1.6	2013-12-11 09:59:17 +00:00
.pydevproject	fixex pydev for current version	2015-04-29 17:45:02 +02:00
requirements.txt	Fixing up several minor lang issues	2015-09-07 21:40:12 +02:00