Lorenzo Tilve Álvaro 909eab9f52 Merge branch 'master' into mpxj-import ... Conflicts: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java libreplan-business/src/main/resources/db.changelog-1.3.xml		2013-03-27 17:57:03 +01:00
..
database	Update database scripts for LibrePlan 1.3.2	2012-11-30 07:40:52 +01:00
functional-tests	Add new bound resources test in functional tests suites	2013-01-16 12:37:13 +01:00
jira-connector	Jira-integration: modified to test the classes instead code copied and jira label is moved to jira-conn-properties	2013-02-05 14:02:25 +01:00
mpxj-import	Adds new example files	2012-09-10 17:37:50 +02:00
rest-clients	doc: Add .rst extension to web services README	2012-11-28 18:08:54 +01:00
gettext-keys-generator.pl	i18n: Prevent extract empty strings in gettext-keys-generator.pl	2012-07-03 08:54:08 +02:00
libreplan-all-keys-generator.sh	Rename pending file to libreplan	2011-10-28 10:28:43 +02:00
replace-keys.rb	Script for replacing strings in Java files	2012-07-04 03:49:55 +02:00