From: raeno Date: Wed, 19 Dec 2018 18:39:44 +0000 (+0400) Subject: Merge branch 'develop' into oembed_provider X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7fb37804313339f9a2215aea27ece42e8ec31312;p=akkoma Merge branch 'develop' into oembed_provider --- 7fb37804313339f9a2215aea27ece42e8ec31312 diff --cc .idea/libraries/gen_smtp.xml index 000000000,000000000..e02c2c68c new file mode 100644 --- /dev/null +++ b/.idea/libraries/gen_smtp.xml @@@ -1,0 -1,0 +1,6 @@@ ++ ++ ++ ++ ++ ++ diff --cc .idea/libraries/html_entities.xml index 000000000,000000000..996a8d55c new file mode 100644 --- /dev/null +++ b/.idea/libraries/html_entities.xml @@@ -1,0 -1,0 +1,6 @@@ ++ ++ ++ ++ ++ ++ diff --cc .idea/libraries/plug_cowboy.xml index 000000000,000000000..30a8b7257 new file mode 100644 --- /dev/null +++ b/.idea/libraries/plug_cowboy.xml @@@ -1,0 -1,0 +1,8 @@@ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc .idea/libraries/plug_crypto.xml index 000000000,000000000..69d4a35b3 new file mode 100644 --- /dev/null +++ b/.idea/libraries/plug_crypto.xml @@@ -1,0 -1,0 +1,8 @@@ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc .idea/libraries/swoosh.xml index 000000000,000000000..546fdb7cd new file mode 100644 --- /dev/null +++ b/.idea/libraries/swoosh.xml @@@ -1,0 -1,0 +1,6 @@@ ++ ++ ++ ++ ++ ++ diff --cc priv/static/index.html index 5958e16b1,167944753..e897a336d --- a/priv/static/index.html +++ b/priv/static/index.html @@@ -1,1 -1,1 +1,1 @@@ - Pleroma
-Pleroma
++Pleroma