diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 20:14:57 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 20:14:57 +0200 |
| commit | 04b382171308e59e728eeb30fc06b2618b8c35ca (patch) | |
| tree | f830cf6bf2ee1ebb18e82558431988bb85b82fc0 /app/Controllers/errorController.php | |
| parent | b2e02ebf873d5045f91ec71091a556a21501c5fe (diff) | |
| parent | 49737be5dfdeb2cb62a46ff1979724cbd0f2c20d (diff) | |
Merge branch 'UnicodeCharacters' of https://github.com/Alkarex/FreshRSS into Alkarex-UnicodeCharacters
Conflicts:
app/i18n/en.php
app/i18n/fr.php
Diffstat (limited to 'app/Controllers/errorController.php')
0 files changed, 0 insertions, 0 deletions