5f26e6e7ca
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes. |
||
---|---|---|
.. | ||
account_counters_spec.rb | ||
account_finder_concern_spec.rb | ||
account_interactions_spec.rb | ||
remotable_spec.rb | ||
status_threading_concern_spec.rb |