• Thibaut Girka's avatar
    Merge branch 'master' into glitch-soc/merge-upstream · ff67385c
    Thibaut Girka authored
    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
    ff67385c
After you've reviewed these contribution guidelines, you'll be all set to contribute to this project.
CONTRIBUTING.md 3.28 KB