tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/master

Browse Source 
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
This commit is contained in:
Thibaut Girka
2020-01-20 15:00:22 +01:00
parent ddcf78d8d3 51182843d4
commit 45709d6987
17 changed files with 812 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/layouts/admin.html.haml
View File

@@ -1,3 +1,6 @@
- content_for :header_tags do
= render_initial_state
- content_for :content do
.admin-wrapper
.sidebar-wrapper