tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Browse Source 
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.
This commit is contained in:
Claire
2023-07-12 16:03:05 +02:00
parent ec95f62cb4 82e477b184
commit 9ae60f8738
458 changed files with 1117 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/migrate/20180831171112_create_bookmarks.rb
View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true
# This migration is a duplicate of 20180410220657 and may get ignored, see
# config/initializers/0_duplicate_migrations.rb