Sean King 21f68bf623 Merge branch 'develop' into 'icon_picker_admin_config' ...

# Conflicts:
#   app/soapbox/features/forms/index.js
#   app/soapbox/features/soapbox_config/index.js

2020-09-26 19:52:52 +00:00

..

__tests__

Fix jest tests for method='post' MR

2020-08-30 20:34:24 -06:00

forkawesome.json

Add font icon picker, not yet fixed fatal error

2020-09-08 20:15:25 -06:00

index.js

Merge branch 'develop' into 'icon_picker_admin_config'

2020-09-26 19:52:52 +00:00