diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-19 14:30:13 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-19 14:30:13 +0000 |
| commit | 678fed47ee0b7e458d3324bea0c1171322d29b5f (patch) | |
| tree | 951f99bb59d3f6af1e33daad95f8bc40e2731b57 /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 7b96a756fbcc6f814e70ad1b9ad6bd45844ea734 (diff) | |
| parent | 8696c25efd69046b29d7803ae3af2783aab473e1 (diff) | |
| download | pleroma-678fed47ee0b7e458d3324bea0c1171322d29b5f.tar.gz pleroma-678fed47ee0b7e458d3324bea0c1171322d29b5f.zip | |
Merge branch 'patch-2' into 'develop'
Ignore setup_db.psql and specify a folder for custom emojis
See merge request pleroma/pleroma!121
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
0 files changed, 0 insertions, 0 deletions