diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-08-05 09:43:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-08-05 11:11:24 -0500 |
| commit | b83758bd9634d4f2fb70a92159072dd44e49bb31 (patch) | |
| tree | 2452e8c4e1544fc9a0ad71292901b6cd52765566 /.gitignore | |
| parent | 2b3d7794b23aac30cf8f977009d17b1abc602d19 (diff) | |
| parent | 5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0 (diff) | |
| download | pleroma-b83758bd9634d4f2fb70a92159072dd44e49bb31.tar.gz pleroma-b83758bd9634d4f2fb70a92159072dd44e49bb31.zip | |
Merge remote-tracking branch 'pleroma/develop' into moderators
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index f30f4cf5f..da73b6f36 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ erl_crash.dump # variables. /config/*.secret.exs /config/generated_config.exs +/config/runtime.exs /config/*.env @@ -56,4 +57,4 @@ pleroma.iml # Editor temp files /*~ -/*#
\ No newline at end of file +/*# |