diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-04 01:12:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-04 01:12:44 -0400 |
| commit | 8bb175d1078de6add55f5c5f689693495d141436 (patch) | |
| tree | 74173c19b2b293b94d993398c41a3063d2f5b364 /.gitignore | |
| parent | eea8637afe78ceff25ddd11d365a3fc022cc5fa4 (diff) | |
| parent | ccc82907124ccd2ad4951c2c4946ae20af007530 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
config.hs
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -6,3 +6,4 @@ privdata/keyring.gpg~ Setup Setup.hi Setup.o +docker |