diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
| commit | db200226b805db324a8efdfb951d7725eac3f9da (patch) | |
| tree | a7d8298fc65bbd81e2f843048240de6e4fceffcf /app/mailers/notification_mailer.rb | |
| parent | afceef74c2377192f100b9307068895ec0ec7d45 (diff) | |
| parent | 0df91c7b1e05952ebbfc552915e995d55af0a403 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
Diffstat (limited to 'app/mailers/notification_mailer.rb')
0 files changed, 0 insertions, 0 deletions