diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-27 14:45:19 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-27 14:45:19 -0400 |
| commit | ce411ee35e22a4d17b953ce4f8d22c7b648857c7 (patch) | |
| tree | 078c282115974d0d4bbdeb97748c26948ae70fcd /.gitignore | |
| parent | f82457d8b3533dfa71b452cf1881ff3393368dd9 (diff) | |
| parent | ca67759c55395c694af51b4ae619fce794b31a1f (diff) | |
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts:
debian/changelog
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -8,6 +8,7 @@ ui_*.py !.coveragerc !.tx +!.gitattributes bin/ build/ core |