diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
| commit | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (patch) | |
| tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /.slugignore | |
| parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
| parent | 90712d42933efd9978e4bbae82f81a4650aa4d84 (diff) | |
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
Diffstat (limited to '.slugignore')
0 files changed, 0 insertions, 0 deletions