From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 1 Feb 2019 15:12:20 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e87bd6d94ad3d9ae85adc48dae9b84e961385404;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
---

e87bd6d94ad3d9ae85adc48dae9b84e961385404
diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
index d6add9b0d,9e7d39166..07faa4132
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@@ -17,7 -17,7 +17,8 @@@ import { isMobile } from '../../../is_m
  import ImmutablePureComponent from 'react-immutable-pure-component';
  import { length } from 'stringz';
  import { countableText } from '../util/counter';
+ import Icon from 'mastodon/components/icon';
 +import { maxChars } from '../../../initial_state';
  
  const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
  
diff --cc config/locales/pl.yml
index 9f457a460,188f5c22b..23fa10179
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@@ -631,8 -638,8 +638,9 @@@ pl
      resources: Zasoby
    generic:
      changes_saved_msg: Ustawienia zapisane!
+     copy: Kopiuj
      save_changes: Zapisz zmiany
 +    use_this: Użyj tego
      validation_errors:
        few: Coś jest wciąż nie tak! Przejrzyj %{count} poniższe błędy
        many: Coś jest wciąż nie tak! Przejrzyj %{count} poniższych błędów