mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 06:09:08 +09:00
9ae60f8738
Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file. |
||
---|---|---|
.. | ||
exports | ||
migration | ||
preferences | ||
two_factor_authentication | ||
aliases_controller_spec.rb | ||
applications_controller_spec.rb | ||
deletes_controller_spec.rb | ||
exports_controller_spec.rb | ||
featured_tags_controller_spec.rb | ||
flavours_controller_spec.rb | ||
imports_controller_spec.rb | ||
login_activities_controller_spec.rb | ||
migrations_controller_spec.rb | ||
pictures_controller_spec.rb | ||
profiles_controller_spec.rb | ||
sessions_controller_spec.rb | ||
two_factor_authentication_methods_controller_spec.rb |