diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-08-04 11:48:57 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-08-04 11:48:57 -0500 |
| commit | 44ede0657f2da0a761de76b1f9822a293430d497 (patch) | |
| tree | 387a8915bdb6ff1295f4f0872b2e6bc97e177831 /.gitignore | |
| parent | 1f093cb216ed0d6b0d23b05e1ffbbf55dc72bbee (diff) | |
| parent | d8a986c9e893de8eed3aa336a557695669b1ffee (diff) | |
| download | pleroma-44ede0657f2da0a761de76b1f9822a293430d497.tar.gz pleroma-44ede0657f2da0a761de76b1f9822a293430d497.zip | |
Merge remote-tracking branch 'pleroma/develop' into staff-plug
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 +/*# |