bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
bigbuffet-rw/app/soapbox/features/public_layout/components
History
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
..
footer.js gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00
header.js Resolved merge conflicts 2020-08-07 20:53:42 +00:00
site_banner.js gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00
site_logo.js gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00