Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

This commit is contained in:
Roger Braun 2018-01-29 17:45:44 +01:00
commit ede4883ac9
31 changed files with 31 additions and 0 deletions

View File

@ -1 +1,31 @@
firefox, /emoji/Firefox.gif firefox, /emoji/Firefox.gif
blank, /emoji/blank.png
f_00b, /emoji/f_00b.png
f_00b11b, /emoji/f_00b11b.png
f_00b33b, /emoji/f_00b33b.png
f_00h, /emoji/f_00h.png
f_00t, /emoji/f_00t.png
f_01b, /emoji/f_01b.png
f_03b, /emoji/f_03b.png
f_10b, /emoji/f_10b.png
f_11b, /emoji/f_11b.png
f_11b00b, /emoji/f_11b00b.png
f_11b22b, /emoji/f_11b22b.png
f_11h, /emoji/f_11h.png
f_11t, /emoji/f_11t.png
f_12b, /emoji/f_12b.png
f_21b, /emoji/f_21b.png
f_22b, /emoji/f_22b.png
f_22b11b, /emoji/f_22b11b.png
f_22b33b, /emoji/f_22b33b.png
f_22h, /emoji/f_22h.png
f_22t, /emoji/f_22t.png
f_23b, /emoji/f_23b.png
f_30b, /emoji/f_30b.png
f_32b, /emoji/f_32b.png
f_33b, /emoji/f_33b.png
f_33b00b, /emoji/f_33b00b.png
f_33b22b, /emoji/f_33b22b.png
f_33h, /emoji/f_33h.png
f_33t, /emoji/f_33t.png

View File

@ -22,6 +22,7 @@ server {
server_name example.tld; server_name example.tld;
location / { location / {
add_header 'Access-Control-Allow-Origin' '*';
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";

BIN
priv/static/emoji/blank.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

BIN
priv/static/emoji/f_00b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
priv/static/emoji/f_00h.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
priv/static/emoji/f_00t.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
priv/static/emoji/f_01b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
priv/static/emoji/f_03b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
priv/static/emoji/f_10b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
priv/static/emoji/f_11b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
priv/static/emoji/f_11h.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
priv/static/emoji/f_11t.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
priv/static/emoji/f_12b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
priv/static/emoji/f_21b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
priv/static/emoji/f_22b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
priv/static/emoji/f_22h.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
priv/static/emoji/f_22t.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
priv/static/emoji/f_23b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
priv/static/emoji/f_30b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
priv/static/emoji/f_32b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
priv/static/emoji/f_33b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
priv/static/emoji/f_33h.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
priv/static/emoji/f_33t.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB