diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-31 14:45:37 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-31 14:45:37 +0100 |
| commit | a97bbd9bd54c5fa56d54b3c214cf4e8af96af8b2 (patch) | |
| tree | 6e83890bc1b3814a12c3b7bedc0d5944f30f507b /extensions | |
| parent | 42fd539a1b14f883077048a35864b4294b6efe94 (diff) | |
| parent | e91b72b63cd11ae3c4f59e48439e93955242c673 (diff) | |
Merge branch 'dev'
Conflicts:
CHANGELOG
README.fr.md
README.md
app/Controllers/feedController.php
app/Controllers/indexController.php
app/i18n/en.php
app/i18n/fr.php
app/views/helpers/view/normal_view.phtml
app/views/stats/index.phtml
app/views/stats/repartition.phtml
constants.php
p/scripts/main.js
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/.gitignore | 1 | ||||
| -rw-r--r-- | extensions/README.md | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/extensions/.gitignore b/extensions/.gitignore new file mode 100644 index 000000000..cd5592022 --- /dev/null +++ b/extensions/.gitignore @@ -0,0 +1 @@ +[xX]* diff --git a/extensions/README.md b/extensions/README.md new file mode 100644 index 000000000..4c1a81f5c --- /dev/null +++ b/extensions/README.md @@ -0,0 +1,3 @@ +# FreshRSS extensions + +You may place in this directory some custom extensions for FreshRSS. |