mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 11:48:46 +00:00
d8b0a732aa
Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
seeds | ||
views | ||
schema.rb | ||
seeds.rb |