diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-24 19:26:01 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-24 19:26:01 +0000 |
| commit | d4a54a90c9ae39947c71876d4d2988a05a02d7a1 (patch) | |
| tree | be9b1952c9103e0ca01b5a18ddb0939d52fcd999 | |
| parent | c78e7d8b1159b5f36c4776d00f5e4b86a73d3ef5 (diff) | |
| parent | 52b1bc782b889bca92595396be383b4dc805ee2e (diff) | |
| download | pleroma-d4a54a90c9ae39947c71876d4d2988a05a02d7a1.tar.gz pleroma-d4a54a90c9ae39947c71876d4d2988a05a02d7a1.zip | |
Merge branch 'gitignore' into 'develop'
Gitignore
See merge request pleroma/pleroma!131
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 2858cefd5..3fbf17ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /*.ez /uploads /test/uploads +/.elixir_ls # Prevent committing custom emojis /priv/static/emoji/custom/* @@ -22,3 +23,6 @@ erl_crash.dump # Database setup file, some may forget to delete it /config/setup_db.psql + +.DS_Store +.env
\ No newline at end of file |