diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
| commit | 3a03d9b65f96099e7c7a831469532c2cec7294c6 (patch) | |
| tree | 46d84731c3a53157117fc4c8141fdf6b3d7b8b25 /.gitignore | |
| parent | a704d5499c03cb5609ea38a5f2ef06095ced3ef3 (diff) | |
| parent | a8adc300d4cfc88ef19f1977e32068437ed4ad00 (diff) | |
| download | pleroma-nsfw-api-mrf.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrfnsfw-api-mrf
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 +/*# |