Skip to content

Commit

Permalink
Merge branch 'michel_103_py_docs' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
neumino committed Dec 10, 2013
2 parents b5822bd + ca6e271 commit 7039754
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 2,576 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ drivers/python/rethinkdb/ql2.pb.cc
drivers/python/rethinkdb/ql2.pb.h
drivers/python/rethinkdb_pbcpp.so
test_results.*
drivers/python/rethinkdb/docs.py
drivers/python/ql2.proto
scripts/cluster_directory_*
packaging/ami/build-ami-files/static-web
Loading

0 comments on commit 7039754

Please sign in to comment.