Alexandre Alapetite
|
59eb4e1c2a
Merge remote-tracking branch 'origin/NewsPlus' into dev
|
11 years ago |
Alexandre Alapetite
|
10d98e0ce9
Google Reader API: work-around for News+ bug
|
11 years ago |
Alexandre Alapetite
|
65b41af94d
Google Reader API: work-around for News+ bug
|
11 years ago |
Alexandre Alapetite
|
67f66358d4
Merge remote-tracking branch 'origin/PubSubHubbub' into dev
|
11 years ago |
Alexandre Alapetite
|
6c2bebaff2
Merge branch 'FreshRSS/dev' into PubSubHubbub
|
11 years ago |
Alexandre Alapetite
|
8f32dc2b79
Merge branch 'FreshRSS/dev' into dev
|
11 years ago |
Alexandre Alapetite
|
9b69ec4b31
Merge pull request #842 from Alwaysin/patch-9
|
11 years ago |
Alexandre Alapetite
|
3e738e91e0
Merge pull request #843 from Alwaysin/patch-10
|
11 years ago |
Alexandre Alapetite
|
c2046e513f
Merge pull request #844 from Alwaysin/patch-4
|
11 years ago |
Alwaysin
|
7524811c96
Language fix
|
11 years ago |
Alwaysin
|
6263ecef2f
Language fix
|
11 years ago |
Alwaysin
|
265f09f257
Language fix
|
11 years ago |
Alexandre Alapetite
|
98773aca59
Merge branch 'FreshRSS/dev' into PubSubHubbub
|
11 years ago |
Alexandre Alapetite
|
0ee60dd065
Merge branch 'FreshRSS/dev' into dev
|
11 years ago |
Alexandre Alapetite
|
83ab561242
Merge remote-tracking branch 'origin/PubSubHubbub' into dev
|
11 years ago |
Alexandre Alapetite
|
001c713f03
PubSubHubbub better gestion of errors
|
11 years ago |
Alexandre Alapetite
|
cad42ea55f
i18n: en-GB revert
|
11 years ago |
Alexandre Alapetite
|
7a7f6edb15
Merge pull request #840 from Alwaysin/patch-6
|
11 years ago |
Alexandre Alapetite
|
3d20c98cfc
Merge pull request #839 from Alwaysin/patch-5
|
11 years ago |
Alexandre Alapetite
|
8f89d306e8
Merge pull request #837 from Alwaysin/patch-3
|
11 years ago |
Alwaysin
|
af166f6c53
Language fix
|
11 years ago |
Alwaysin
|
35cdb89eed
Language fix + en_GB standardisation
|
11 years ago |
Alwaysin
|
6d31c60976
Language fix
|
11 years ago |
Alexandre Alapetite
|
a3df8418c5
Merge remote-tracking branch 'origin/PubSubHubbub' into dev
|
11 years ago |
Alexandre Alapetite
|
5dfa9a9e52
Merge branch 'FreshRSS/dev' into PubSubHubbub
|
11 years ago |
Alexandre Alapetite
|
ee39b7e114
Merge branch 'FreshRSS/dev' into dev
|
11 years ago |
Alexandre Alapetite
|
84ea636d2d
PubSubHubbub bug skip pull
|
11 years ago |
Alexandre Alapetite
|
c1a5b8045e
Merge pull request #835 from Alwaysin/patch-1
|
11 years ago |
Alwaysin
|
6985a73f1c
Typo fix
|
11 years ago |
Alexandre Alapetite
|
94be7f117b
Merge remote-tracking branch 'origin/PubSubHubbub' into dev
|
11 years ago |