Marion Muszynski e554592f77 Merge branch 'ticket-12487-HTTPS' into develop		2017-03-08 17:51:22 +01:00
..
classes	Merge branch 'ticket-12487-HTTPS' into develop	2017-03-08 17:51:22 +01:00
controllers	fix conflicts	2017-02-21 11:51:37 +01:00
index.php	push site	2016-01-04 12:48:08 +01:00