1. 18 Feb, 2019 2 commits
    • Lukas Fülling's avatar
      Merge branch 'master' of git.k40s.net:commnet/mastodon · da101c92
      Lukas Fülling authored
       Conflicts:
      	README.md
      	app/javascript/mastodon/components/status_action_bar.js
      	app/javascript/mastodon/features/getting_started/index.js
      	app/javascript/mastodon/features/status/components/action_bar.js
      	app/javascript/mastodon/features/status/components/detailed_status.js
      	app/javascript/mastodon/features/ui/index.js
      	app/lib/activitypub/activity.rb
      	app/lib/activitypub/activity/announce.rb
      	app/lib/activitypub/activity/create.rb
      	config/locales/en.yml
      	config/locales/simple_form.de.yml
      	config/settings.yml
      	package.json
      	spec/lib/activitypub/activity/announce_spec.rb
      	yarn.lock
      da101c92
    • Lukas Fülling's avatar
      Merge branch 'master' of github.com:tootsuite/mastodon · b4a8d758
      Lukas Fülling authored
       Conflicts:
      	README.md
      	app/javascript/mastodon/components/status_action_bar.js
      	app/javascript/mastodon/features/getting_started/index.js
      	app/javascript/mastodon/features/status/components/action_bar.js
      	app/javascript/mastodon/features/status/components/detailed_status.js
      	app/javascript/mastodon/features/ui/index.js
      	app/javascript/mastodon/locales/ar.json
      	app/javascript/mastodon/locales/ca.json
      	app/javascript/mastodon/locales/de.json
      	app/javascript/mastodon/locales/fi.json
      	app/javascript/mastodon/locales/ja.json
      	app/javascript/mastodon/locales/pl.json
      	app/models/account.rb
      	app/views/layouts/error.html.haml
      	app/views/stream_entries/_simple_status.html.haml
      	app/views/tags/show.html.haml
      	config/locales/ast.yml
      	config/locales/ca.yml
      	config/locales/co.yml
      	config/locales/de.yml
      	config/locales/devise.ja.yml
      	config/locales/devise.ru.yml
      	config/locales/devise.sk.yml
      	config/locales/el.yml
      	config/locales/en.yml
      	config/locales/eo.yml
      	config/locales/gl.yml
      	config/locales/he.yml
      	config/locales/hu.yml
      	config/locales/id.yml
      	config/locales/io.yml
      	config/locales/nl.yml
      	config/locales/oc.yml
      	config/locales/pt-BR.yml
      	config/locales/simple_form.de.yml
      	config/locales/te.yml
      	config/locales/th.yml
      	config/locales/tr.yml
      	config/locales/zh-CN.yml
      	config/locales/zh-HK.yml
      	package.json
      	yarn.lock
      b4a8d758
  2. 17 Feb, 2019 4 commits
  3. 16 Feb, 2019 4 commits
  4. 15 Feb, 2019 6 commits
  5. 14 Feb, 2019 24 commits