diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-26 16:49:44 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-26 16:49:44 +0200 |
| commit | dd5273871a74d01d87fa1eaad7aa53bc1c148f85 (patch) | |
| tree | d59245952cc982ef8b09119e71739d3c0adc2c99 /app/models/RSSConfiguration.php | |
| parent | 298b5ecf206ff0020d8fed29e9aba4d7b148b080 (diff) | |
| parent | 410f7631988e277d615c5acab44d3380f5f34b9b (diff) | |
Merge branch 'AvoidNonCacheableJavaScript' of https://github.com/Alkarex/FreshRSS into Alkarex-AvoidNonCacheableJavaScript
Conflicts:
app/views/javascript/main.phtml
Diffstat (limited to 'app/models/RSSConfiguration.php')
0 files changed, 0 insertions, 0 deletions