diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-01 15:55:05 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-01 15:55:05 -0500 |
| commit | 9d89e1736a08d6c559355e52a996782994608cd4 (patch) | |
| tree | cf34422a48ea0e6cad4299db7816b094512416fe /.gitignore | |
| parent | 9166ae1bcf8a8ec113bb21aab7effca5a14601ca (diff) | |
| parent | 3fe6ada6fc6f42057cb346c04e4ecc9f35c0e5cb (diff) | |
| download | pleroma-cycles-config-url.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into cycles-config-urlcycles-config-url
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 +/*# |