diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-01 16:12:20 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-01 16:12:20 +0100 |
| commit | e87bd6d94ad3d9ae85adc48dae9b84e961385404 (patch) | |
| tree | c7bcb2d7a1403af5457e8a6f47f424c83983676a /.foreman | |
| parent | f611da489929d2592b61b0c0f7c870ae33782343 (diff) | |
| parent | 3de63b3c351c7584e911b4839dff6395d2ccb5ec (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes
Diffstat (limited to '.foreman')
0 files changed, 0 insertions, 0 deletions