Curtis 6435bb0bc5 Resolved merge conflicts ...

Merge branch 'develop' into 'translate_public_header'

# Conflicts:
#   app/soapbox/features/public_layout/components/header.js

2020-08-07 20:53:42 +00:00

..

fonts

Fonts: spinster --> soapbox

2020-06-09 20:14:18 -05:00

images

Remove all themes except light and dark

2020-05-31 18:28:58 -05:00

soapbox

Resolved merge conflicts

2020-08-07 20:53:42 +00:00

styles

Merge branch 'mfa' into 'develop'

2020-08-07 20:17:13 +00:00

application.js

Webpack: Reduce to one entrypoint, app/application.js

2020-05-28 18:46:24 -05:00

index.ejs

Add <!--server-generated-meta-->

2020-07-15 10:59:44 -05:00