Curtis 36e634b0aa Resolved merge conflicts ...

Merge branch 'develop' into 'timeline-word-filters'

# Conflicts:
#   app/soapbox/components/sidebar_menu.js
#   app/styles/application.scss

2020-08-07 20:46:44 +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:46:44 +00:00

styles

Resolved merge conflicts

2020-08-07 20:46:44 +00:00

application.js

…

index.ejs

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

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