about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/composer/warning
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-04-10 09:16:08 +0200
committerThibaut Girka <thib@sitedethib.com>2019-04-10 09:16:08 +0200
commit5085559b15ef1c1fe3742757d00e5651fc52b5b5 (patch)
tree0249b98caced1e39387564f04391eb1a0c39a2d7 /app/javascript/flavours/glitch/features/composer/warning
parentcb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff)
parent830c2a9ccbe98e145640e12637ef3da56f41a7b5 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer/warning')
0 files changed, 0 insertions, 0 deletions