Joas Schilling e3eb82cf7d Merge remote-tracking branch 'Marc/ticket/11914' into develop ... * Marc/ticket/11914: [ticket/11914] Add assets version to included plupload scripts [ticket/11914] Update plupload to 2.0.0 [ticket/11914] Use unix line endings in plupload queue css file		2013-11-27 15:18:39 +01:00
..
javascript	Merge pull request #1856 from prototech/ticket/12001	2013-11-21 13:56:03 -08:00
plupload	[ticket/11914] Update plupload to 2.0.0	2013-10-23 14:44:55 +02:00