rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/.github
History
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
..
ISSUE_TEMPLATE Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
CODEOWNERS
…
FUNDING.yml
…
stale.yml Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00