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.
CLI::Cache
NotificationMailer
RSpec/IndexedLet
RSpec/StubbedMock
RSpec/VerifiedDoubles
lib/linter