Alexandre Alapetite c6fd65ef76 Resolve git conflict

2016-08-01 18:10:46 +02:00

..

Controllers

Merge pull request #1187 from Alkarex/remove_persona

2016-08-01 18:07:03 +02:00

Exceptions

PHP 5.2 compatiblity

2015-06-03 20:21:32 +02:00

i18n

Remove Mozilla Persona login

2016-07-31 14:58:19 +02:00

layout

Restaure compatibility with Internet Explorer 11 / Edge

2016-07-31 18:25:02 +02:00

Models

Merge pull request #1187 from Alkarex/remove_persona

2016-08-01 18:07:03 +02:00

SQL

MySQL UTF8MB4 minor details

2016-08-01 17:52:21 +02:00

views

Resolve git conflict

2016-08-01 18:10:46 +02:00

.htaccess

Déplacement de ./actualize_script.php sous ./app/

2013-12-26 13:26:05 +01:00

actualize_script.php

Remove calls to syslog()

2015-01-29 10:14:45 +01:00

FreshRSS.php

Remove Mozilla Persona login

2016-07-31 14:58:19 +02:00

index.html

Déplacement de ./actualize_script.php sous ./app/

2013-12-26 13:26:05 +01:00

install.php

Merge pull request #1187 from Alkarex/remove_persona

2016-08-01 18:07:03 +02:00