summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2016-09-23 06:45:18 +0000
committerazul <azul@riseup.net>2016-09-23 06:45:18 +0000
commit6721f0732facd87404eecc288357fd1bd0de48cf (patch)
tree58b0f80b545987d5fc7f3dfdd4a3c1563cbc216e /.gitignore
parente2aedcaade71dfe9103fdc8e705f59ece5f3a4d0 (diff)
parent68ffe9928620d3e5e3b96152ed4d37da90f6a89b (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--.gitignore4
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 6dfed3c..22d0d82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-pkg
-Gemfile.lock
-NOTES \ No newline at end of file
+vendor