mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-08-19 23:04:42 +00:00
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 |
||
---|---|---|
.. | ||
avatars/original | ||
emoji | ||
headers/original | ||
ocr/lang-data | ||
sounds | ||
500.html | ||
android-chrome-192x192.png | ||
apple-touch-icon.png | ||
background-cybre.png | ||
badge.png | ||
browserconfig.xml | ||
clock.js | ||
embed.js | ||
favicon-dev.ico | ||
favicon.ico | ||
logo-cybre-glitch.gif | ||
mask-icon.svg | ||
mstile-150x150.png | ||
oops.gif | ||
oops.png | ||
riot-glitch.png | ||
robots.txt | ||
sw.js | ||
web-push-icon_expand.png | ||
web-push-icon_favourite.png | ||
web-push-icon_reblog.png |