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:44:42 +02:00
2019-10-24 22:44:42 +02:00
2019-10-07 04:33:31 +02:00
2019-10-25 11:48:20 +02:00
2019-08-01 19:17:17 +02:00
2019-11-13 23:02:10 +01:00
2019-11-11 00:05:02 +02:00
2019-11-07 13:43:56 +01:00
2019-10-01 17:11:14 +02:00
2019-09-01 20:04:35 +02:00
2019-08-01 19:17:17 +02:00
2019-09-23 00:48:43 +02:00
2019-08-01 19:17:17 +02:00
2019-10-01 04:57:27 +02:00
2019-08-01 19:17:17 +02:00
2019-09-29 16:27:00 +02:00
2019-09-29 16:27:00 +02:00
2019-10-06 22:11:17 +02:00
2019-11-13 23:02:10 +01:00
2019-10-22 01:31:27 +09:00
2019-08-01 19:17:17 +02:00
2019-02-04 04:45:29 +01:00
2019-08-01 19:17:17 +02:00
2019-02-01 00:14:05 +01:00
2019-08-03 19:10:39 +02:00
2019-08-01 19:17:17 +02:00
2019-08-03 19:10:39 +02:00
2019-08-01 19:17:17 +02:00
2019-11-04 13:03:29 +01:00
2019-08-01 19:17:17 +02:00
2019-11-11 00:05:02 +02:00
2019-10-01 04:57:27 +02:00
2019-04-27 03:24:09 +02:00
2019-05-25 21:27:00 +02:00
2019-03-18 18:34:56 +01:00
2019-11-19 21:24:16 +01:00
2019-11-13 23:02:10 +01:00
2019-10-25 11:48:20 +02:00