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-19 19:58:40 +02:00
2019-10-01 04:54:29 +02:00
2018-09-10 18:26:47 +02:00
2019-09-13 19:15:59 +02:00
2019-09-30 12:23:57 +02:00
2019-10-01 20:48:49 +02:00
2018-09-18 16:45:58 +02:00
2018-04-21 21:35:55 +02:00
2019-11-20 15:36:09 +01:00
2019-10-03 03:17:29 +02:00
2019-09-02 18:11:34 +02:00
2019-06-06 18:51:46 +02:00
2019-09-02 18:12:12 +02:00
2019-09-19 19:58:40 +02:00
2019-10-06 22:11:17 +02:00
2017-11-17 19:29:16 -08:00
2018-07-09 07:13:59 +02:00
2019-09-28 19:41:36 +02:00
2019-01-24 13:32:23 +01:00
2019-10-03 03:17:41 +02:00
2019-07-07 16:16:51 +02:00
2019-10-24 22:46:59 +02:00
2019-11-13 23:02:10 +01:00
2019-09-19 11:09:05 +02:00