mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-10-21 11:27:34 +02:00
f8e07ca5cd
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). |
||
---|---|---|
.. | ||
about.js | ||
application.js | ||
common.js | ||
public.js | ||
share.js |