67028c4779
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |
67028c4779
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |