Merge remote-tracking branch 'origin/develop' into pleroma-conversations

Browse source

...

This commit is contained in:

lain 2019-08-08 16:04:20 +02:00

parent e4a01d253e b18234e04c

commit a2b98f6d58

90 changed files with 2467 additions and 386 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

priv/static/emoji/f_00b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 371 B

BIN

priv/static/emoji/f_00b11b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 661 B

BIN

priv/static/emoji/f_00b33b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 662 B

BIN

priv/static/emoji/f_00h.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 7.3 KiB

BIN

priv/static/emoji/f_00t.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 541 B

BIN

priv/static/emoji/f_01b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4.4 KiB

BIN

priv/static/emoji/f_03b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

priv/static/emoji/f_10b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

priv/static/emoji/f_11b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 447 B

BIN

priv/static/emoji/f_11b00b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 615 B

BIN

priv/static/emoji/f_11b22b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 618 B

BIN

priv/static/emoji/f_11h.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

priv/static/emoji/f_11t.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 559 B

BIN

priv/static/emoji/f_12b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4.3 KiB

BIN

priv/static/emoji/f_21b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

priv/static/emoji/f_22b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 386 B

BIN

priv/static/emoji/f_22b11b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 666 B

BIN

priv/static/emoji/f_22b33b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 663 B

BIN

priv/static/emoji/f_22h.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 7.3 KiB

BIN

priv/static/emoji/f_22t.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 549 B

BIN

priv/static/emoji/f_23b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4.2 KiB

BIN

priv/static/emoji/f_30b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4.3 KiB

BIN

priv/static/emoji/f_32b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.9 KiB

BIN

priv/static/emoji/f_33b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 459 B

BIN

priv/static/emoji/f_33b00b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 611 B

BIN

priv/static/emoji/f_33b22b.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 623 B

BIN

priv/static/emoji/f_33h.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

priv/static/emoji/f_33t.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 563 B