diff options
| author | azul <azul@riseup.net> | 2016-09-23 06:45:18 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2016-09-23 06:45:18 +0000 |
| commit | 6721f0732facd87404eecc288357fd1bd0de48cf (patch) | |
| tree | 58b0f80b545987d5fc7f3dfdd4a3c1563cbc216e /.gitignore | |
| parent | e2aedcaade71dfe9103fdc8e705f59ece5f3a4d0 (diff) | |
| parent | 68ffe9928620d3e5e3b96152ed4d37da90f6a89b (diff) | |
Merge branch 'feature/deal-with-network-failures' into 'master'
Feature/deal with network failures
Also activates the new nicknym lookup.
See merge request !5
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,3 +1 @@ -pkg -Gemfile.lock -NOTES
\ No newline at end of file +vendor |