summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-07 18:13:39 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-07 18:13:39 +0000
commitda4315b5ef643f07376f159df6fd41636e07e01d (patch)
treeb38e3fab1f9038661f9e611448c676a69ec64f6b
parent8764f646900f577add5cc606b433870633b2e4d5 (diff)
parent3c925e9d889da7f7ec22c98572a9ef2b080f81be (diff)
downloadpleroma-da4315b5ef643f07376f159df6fd41636e07e01d.tar.gz
pleroma-da4315b5ef643f07376f159df6fd41636e07e01d.zip
Merge branch 'emoji-alphabetical-ordering' into 'develop'
Emojis: Alphabetical ordering Closes #366 See merge request pleroma/pleroma!515
-rw-r--r--lib/pleroma/emoji.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 0a5e1d5ce..523dea652 100644
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Emoji do
"""
use GenServer
@ets __MODULE__.Ets
- @ets_options [:set, :protected, :named_table, {:read_concurrency, true}]
+ @ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}]
@doc false
def start_link() do