Merge branch 'master' into markjh/room_tags

This commit is contained in:
Mark Haines 2015-10-26 16:47:46 +00:00
commit f8275e3e4f

View file

@ -21,6 +21,8 @@
======================= ================= =========================================== ======================= ================= ===========================================
{% endfor %} {% endfor %}
Example:: Example:
.. code:: json
{{example | jsonify(4, 4)}} {{example | jsonify(4, 4)}}