Merge remote-tracking branch 'origin/dev' into dev

Conflicts: docs/source/conf.py docs/source/config/outputs/index.rst docs/source/config/outputs/sandbox.rst docs/source/sandbox/lpeg.rst docs/source/sandbox/output.rst
mozilla-services · Feb 6, 2015 · 00b6131 · 00b6131
2 parents 3dc5de0 + a5bce09
commit 00b6131
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/docs/source/config/outputs/index_noref.rst b/docs/source/config/outputs/index_noref.rst
@@ -40,6 +40,8 @@ Outputs
 .. include:: /config/outputs/sandbox.rst
    :start-line: 1
 
+.. include:: /config/outputs/sandbox.rst
+
 .. include:: /config/outputs/smtp.rst
    :start-line: 1