Tristan Darricau 9c49aebfe9

Merge branch '3.2.x' ...

* 3.2.x:
  [ticket/14974] make cookie notice configurable via language files

2017-03-19 18:11:43 +01:00

..

all/template

[ticket/13645] Move the feeds to controllers

2015-08-23 22:36:10 +02:00

prosilver

Merge branch '3.2.x'

2017-03-19 18:11:43 +01:00