Merge commit 'c913d645c588b8219741c57ec37c049add89c7b0'

spacewander · Jul 29, 2014 · e2a6848 · e2a6848
2 parents 194b1c1 + c913d64
commit e2a6848
Show file tree

Hide file tree

Showing 129 changed files with 15,059 additions and 4,362 deletions.
diff --git a/en/.buildinfo b/en/.buildinfo
@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: 660dfb7e8dce29f718cee8fccd60d055
+tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/en/.doctrees/blueprints.doctree b/en/.doctrees/blueprints.doctree
diff --git a/en/.doctrees/conclusion.doctree b/en/.doctrees/conclusion.doctree
diff --git a/en/.doctrees/configuration.doctree b/en/.doctrees/configuration.doctree
diff --git a/en/.doctrees/conventions.doctree b/en/.doctrees/conventions.doctree
diff --git a/en/.doctrees/deployment.doctree b/en/.doctrees/deployment.doctree
diff --git a/en/.doctrees/environment.doctree b/en/.doctrees/environment.doctree
diff --git a/en/.doctrees/environment.pickle b/en/.doctrees/environment.pickle
diff --git a/en/.doctrees/forms.doctree b/en/.doctrees/forms.doctree
diff --git a/en/.doctrees/index.doctree b/en/.doctrees/index.doctree
diff --git a/en/.doctrees/organizing.doctree b/en/.doctrees/organizing.doctree
diff --git a/en/.doctrees/preface.doctree b/en/.doctrees/preface.doctree
diff --git a/en/.doctrees/static.doctree b/en/.doctrees/static.doctree
diff --git a/en/.doctrees/storing.doctree b/en/.doctrees/storing.doctree
diff --git a/en/.doctrees/templates.doctree b/en/.doctrees/templates.doctree
diff --git a/en/.doctrees/users.doctree b/en/.doctrees/users.doctree
diff --git a/en/.doctrees/views.doctree b/en/.doctrees/views.doctree
diff --git a/en/.gitignore b/en/.gitignore
diff --git a/en/.nojekyll b/en/.nojekyll
diff --git a/en/1-introduction.md b/en/1-introduction.md
diff --git a/en/10-storing-data.md b/en/10-storing-data.md