diff options
| author | David Phillips <david@sighup.nz> | 2017-03-17 10:16:35 +1300 |
|---|---|---|
| committer | David Phillips <david@sighup.nz> | 2017-03-17 10:16:35 +1300 |
| commit | 43a93894769711c44485aa40604d63587aedd77a (patch) | |
| tree | 3dc7a5bbbd2decd7bfd42c171a820f114cc5eb1d /.gitignore | |
| parent | be16e77827b779fdaab0e703f850d3561b3c0b8c (diff) | |
| parent | 03802a8644320719134817c4a510b4bfccd5390f (diff) | |
| download | idalius-43a93894769711c44485aa40604d63587aedd77a.tar.xz | |
Merge remote-tracking branch 'alyptik/trumpet' into trumpet
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -bot.conf +*.conf |