FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript
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
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
flavours [Glitch] Minor improvements to poll composing UI 2019-11-07 14:43:07 +01:00
fonts
…
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales
…
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
skins
…
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00