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
2019-11-20 15:36:09 +01:00
..
2019-09-05 11:36:41 +02:00
2019-11-07 14:43:07 +01:00
2019-06-10 18:59:53 +02:00
2018-12-01 21:00:16 +01:00
2019-11-20 15:36:09 +01:00
2019-11-06 14:38:28 +01:00
2018-05-07 17:00:02 +02:00
2019-11-20 15:36:09 +01:00