Laurent Destailleur
5385d87995
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/langs/ca_ES/admin.lang
htdocs/langs/ca_ES/errors.lang
htdocs/langs/ca_ES/main.lang
htdocs/langs/ca_ES/opensurvey.lang
htdocs/langs/ca_ES/paybox.lang
htdocs/langs/ca_ES/products.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/errors.lang
htdocs/langs/es_ES/main.lang
htdocs/langs/es_ES/products.lang
2013-07-05 21:56:54 +02:00
..
2013-04-06 18:59:22 +02:00
2013-01-16 15:36:08 +01:00
2013-06-01 02:21:39 +02:00
2013-01-16 15:36:08 +01:00
2013-04-06 08:20:57 +02:00
2013-03-08 12:04:01 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-06-03 16:34:44 +02:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-03-23 17:34:23 +01:00
2013-02-23 15:23:33 +01:00
2013-01-16 15:36:08 +01:00
2013-07-02 01:26:52 +02:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:36:08 +01:00
2013-06-17 23:24:53 +02:00
2012-09-27 23:54:47 +02:00