diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-17 17:43:54 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-17 17:43:54 +0200 |
| commit | 280d7b1df8566239f15130d8bf1e0e2c1d467fc0 (patch) | |
| tree | 7903e071b0013fb15dcc5a74f6143239dcbaa2c2 /docs/Running-Mastodon/Administration-guide.md | |
| parent | 4a6bc2482a26aa0441485ca360a3d3c0eeea7fe4 (diff) | |
| parent | 59f7f4c923494bb8dd6f2881a1610c7b51240d9c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).
Diffstat (limited to 'docs/Running-Mastodon/Administration-guide.md')
0 files changed, 0 insertions, 0 deletions