From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 7 Nov 2014 10:01:10 +0000 (+0100)
Subject: Merge pull request #12019 from owncloud/fix-template-shortcuts
X-Git-Tag: v8.0.0alpha1~345
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=88c329b394e9a8cddda65b6e3645f7d6dcff279f;p=nextcloud-server.git

Merge pull request #12019 from owncloud/fix-template-shortcuts

second parameter in template shortcuts script() and style() is optional
---

88c329b394e9a8cddda65b6e3645f7d6dcff279f