Commit graph

6 commits

Author SHA1 Message Date
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
crockwave
a5b69e77a3 Added Admin settings opening in new tab 2020-08-07 12:58:59 -05:00
Mary Kate
bdd9204b3c basic filter form component set up 2020-08-04 15:21:42 -05:00
marykatefain
ee97e94779 Bookmark posts 2020-07-29 21:08:36 +00:00
Alex Gleason
ab280b80e1
SecurityForm: Add navigation links 2020-06-05 14:58:59 -05:00
Alex Gleason
d24dcb3e60
gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00
Renamed from app/gabsocial/features/compose/components/action_bar.js (Browse further)