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-11-16 19:02:09 +01:00
2019-09-11 16:32:44 +02:00
2019-02-16 05:27:05 +01:00
2019-09-09 10:50:33 +02:00
2019-10-06 22:11:29 +02:00
2018-11-19 00:43:52 +01:00
2019-03-03 22:18:23 +01:00
2019-05-28 00:26:08 +02:00
2019-11-13 23:02:10 +01:00
2019-10-10 17:26:08 +02:00
2019-10-03 17:50:59 +02:00
2019-07-30 11:10:46 +02:00
2018-11-19 00:43:52 +01:00
2019-11-17 17:09:41 +01:00
2018-10-19 01:47:29 +02:00
2019-09-13 16:01:09 +02:00
2019-08-30 00:14:36 +02:00
2018-07-05 18:31:35 +02:00
2018-11-19 00:43:52 +01:00
2018-09-28 02:23:45 +02:00
2019-09-09 10:50:33 +02:00
2018-07-09 02:22:09 +02:00
2019-09-10 20:56:42 +02:00
2019-10-06 22:11:29 +02:00
2018-11-28 14:46:07 +01:00
2019-09-06 13:55:51 +02:00
2018-07-05 18:31:35 +02:00
2018-08-27 18:09:28 +02:00
2019-05-23 19:01:30 +02:00
2019-06-04 20:10:26 +02:00
2019-03-15 02:39:20 +01:00
2019-08-22 21:55:56 +02:00
2019-01-05 12:43:28 +01:00
2019-08-29 12:07:50 +02:00
2019-10-09 07:10:46 +02:00
2018-07-07 21:09:54 +02:00
2019-08-05 19:54:29 +02:00