mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-02 13:04:37 +00:00
b2915613fb
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |