Tristan Darricau 446bfd9680 Merge branch '3.2.x' ...

* 3.2.x:
  [ticket/15174] Split timeout message to extra method and set timeout to 60s
  [ticket/15174] Increase timeout for loading indicator

2017-04-18 23:43:03 +02:00

..

cookieconsent

[ticket/14961] Add cookie notice as enablable feature

2017-01-06 00:57:12 +01:00

css

[ticket/15152] Updates Font Awesome Icons to version 4.7.0

2017-03-26 21:05:18 +02:00

fonts

[ticket/15152] Updates Font Awesome Icons to version 4.7.0

2017-03-26 21:05:18 +02:00

javascript

Merge branch '3.2.x'

2017-04-18 23:43:03 +02:00

plupload

[ticket/14010] Update Plupload from 2.1.2 to 2.1.8.

2015-07-25 18:54:09 -07:00