ff67385cfb
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 |
||
---|---|---|
.. | ||
account/components | ||
account_gallery | ||
account_timeline | ||
audio | ||
blocks | ||
bookmarked_statuses | ||
community_timeline | ||
compose | ||
direct_timeline | ||
directory | ||
domain_blocks | ||
emoji | ||
favourited_statuses | ||
favourites | ||
follow_requests | ||
followers | ||
following | ||
generic_not_found | ||
getting_started | ||
hashtag_timeline | ||
home_timeline | ||
introduction | ||
keyboard_shortcuts | ||
list_adder | ||
list_editor | ||
list_timeline | ||
lists | ||
mutes | ||
notifications | ||
pinned_statuses | ||
public_timeline | ||
reblogs | ||
report | ||
search | ||
standalone | ||
status | ||
ui | ||
video |