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-10-24 22:45:35 +02:00
2019-09-30 12:23:57 +02:00
2019-11-20 15:36:09 +01:00
2019-10-10 17:08:00 +02:00
2019-09-19 20:58:19 +02:00
2019-07-23 10:51:07 +02:00
2019-10-27 12:14:01 +01:00
2019-09-30 12:23:57 +02:00
2019-09-30 12:23:57 +02:00
2017-04-19 13:52:37 +02:00
2017-04-19 13:52:37 +02:00
2019-10-03 11:10:12 +02:00
2019-11-20 15:36:09 +01:00
2018-08-18 18:04:49 +02:00
2019-09-28 01:33:27 +02:00
2019-09-30 12:23:57 +02:00
2019-07-21 22:32:16 +02:00
2018-10-26 20:41:43 +02:00
2019-09-30 12:23:57 +02:00
2019-09-30 12:23:57 +02:00
2019-08-19 21:49:35 +02:00
2019-08-13 15:30:37 +02:00
2019-07-08 12:03:45 +02:00
2019-08-19 21:49:35 +02:00
2019-09-28 01:33:27 +02:00
2019-09-28 01:33:27 +02:00
2019-09-28 01:33:27 +02:00
2019-08-19 21:49:35 +02:00
2019-03-28 13:01:33 +01:00
2019-09-30 12:23:57 +02:00
2019-09-30 12:23:57 +02:00
2019-08-19 21:49:35 +02:00
2019-09-30 12:23:57 +02:00
2019-09-30 12:23:57 +02:00