diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
| commit | f8e07ca5cdd0d4203d31aa5f0fce79690d5a5190 (patch) | |
| tree | 928e06a97ccd3c3eeef3b3c0ac03c8f59d516e59 /app/javascript/flavours/glitch/styles/forms.scss | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
| parent | 496a6b3dc5274cca08fe58c1d9a7cdc7d10d325b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
Diffstat (limited to 'app/javascript/flavours/glitch/styles/forms.scss')
0 files changed, 0 insertions, 0 deletions