diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
| commit | 3c4cab9be18ff543d025177b418ddd0b16050e68 (patch) | |
| tree | 3b4d32c978ecfaa656256509bf390d6ca22c6679 /.gitignore | |
| parent | 9a98f48ec3f438e543a5a621624401bb22a0d44a (diff) | |
| parent | 41d78f91083b5017e6085150bfae71a842f5c47f (diff) | |
| download | pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.tar.gz pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.zip | |
Merge branch 'develop' into update-oauth-template
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 774893b35..a1e79e4be 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ /db /deps /*.ez -/uploads /test/uploads /.elixir_ls /test/fixtures/test_tmp.txt |