diff options
| author |  Tom Willemsen | 2012-03-27 22:09:16 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-03-27 22:09:16 +0200 |
| commit | 651ab5625df937a39419ddcbf2f1f0e3f5a319e9 (patch) | |
| tree | 5d22fa80f26491af228bdc4cbb56ebee086f8fc0 /.gitignore | |
| parent | 904ab2e1e7f20ecdf833110d71e64f574619dbd8 (diff) | |
| parent | 9c9a34f90dd40740378c46d8dee2d0f671427e47 (diff) | |
| download | dotfiles-651ab5625df937a39419ddcbf2f1f0e3f5a319e9.tar.gz dotfiles-651ab5625df937a39419ddcbf2f1f0e3f5a319e9.zip | |
Merge remote-tracking branch 'github/master' into phoenix
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -84,7 +84,7 @@ News/ auto-save-list bin/ -development/ +code/ documents/ downloads/ feeds @@ -111,3 +111,6 @@ xhtml-loader.rnc .profile .xsession_errors Mail/ +.diaspora/ +.mu/ +.org-timestamps/ |