mirror of https://github.com/tootsuite/mastodon
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 | ||