diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-04 23:43:08 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-04 23:43:08 +0300 |
| commit | 45765918c377c6daf8ee8e5bfad4ea24f67766b6 (patch) | |
| tree | a8ccea9436d7c533a481939a4724c62d8ffac4c0 /priv | |
| parent | f7cd9131d4aa0da3c4c0174acc56ce1bbdbd284c (diff) | |
| parent | 9c9eec62c2fb67507708dd9e5d3f80a098881a6e (diff) | |
| download | pleroma-45765918c377c6daf8ee8e5bfad4ea24f67766b6.tar.gz pleroma-45765918c377c6daf8ee8e5bfad4ea24f67766b6.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/repo/migrations/20190403131720_add_oauth_token_indexes.exs | 9 | ||||
| -rw-r--r-- | priv/static/images/pleroma-fox-tan-smol.png | bin | 0 -> 874668 bytes | |||
| -rw-r--r-- | priv/static/images/pleroma-fox-tan.png | bin | 0 -> 2044257 bytes | |||
| -rw-r--r-- | priv/static/images/pleroma-tan.png | bin | 0 -> 545742 bytes |
4 files changed, 9 insertions, 0 deletions
diff --git a/priv/repo/migrations/20190403131720_add_oauth_token_indexes.exs b/priv/repo/migrations/20190403131720_add_oauth_token_indexes.exs new file mode 100644 index 000000000..ebcd29389 --- /dev/null +++ b/priv/repo/migrations/20190403131720_add_oauth_token_indexes.exs @@ -0,0 +1,9 @@ +defmodule Pleroma.Repo.Migrations.AddOauthTokenIndexes do + use Ecto.Migration + + def change do + create(unique_index(:oauth_tokens, [:token])) + create(index(:oauth_tokens, [:app_id])) + create(index(:oauth_tokens, [:user_id])) + end +end diff --git a/priv/static/images/pleroma-fox-tan-smol.png b/priv/static/images/pleroma-fox-tan-smol.png Binary files differnew file mode 100644 index 000000000..e944d0e2a --- /dev/null +++ b/priv/static/images/pleroma-fox-tan-smol.png diff --git a/priv/static/images/pleroma-fox-tan.png b/priv/static/images/pleroma-fox-tan.png Binary files differnew file mode 100644 index 000000000..da0022ff2 --- /dev/null +++ b/priv/static/images/pleroma-fox-tan.png diff --git a/priv/static/images/pleroma-tan.png b/priv/static/images/pleroma-tan.png Binary files differnew file mode 100644 index 000000000..6c12c8e46 --- /dev/null +++ b/priv/static/images/pleroma-tan.png |
