Laurent Destailleur 6c47ee22b4 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: .travis.yml		2013-09-11 23:12:47 +02:00
..
css	New: jQuery and jQuery UI upgrade	2012-11-03 19:15:45 +01:00
js	Merge remote-tracking branch 'origin/3.3' into 3.4	2013-09-11 21:54:57 +02:00
plugins	Merge remote-tracking branch 'origin/3.4' into develop	2013-09-11 23:12:47 +02:00