mirror of https://framagit.org/tykayn/mastodon.git
![]() Conflicts: Gemfile.lock |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
mailer.scss | ||
win95.scss |
![]() Conflicts: Gemfile.lock |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
mailer.scss | ||
win95.scss |