You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Thibaut Girka
ff67385cfb
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
|
5 years ago |
| .. |
|
bug_report.md
|
…
|
|
|
config.yml
|
…
|
|
|
feature_request.md
|
…
|
|
|
support.md
|
…
|
|
