concrete5/concrete5 — pull request #1173 by jordanlev (2013-07-18 05:34:13+00:00)
Title: fix 404 on block assets when templates directory exists

continuation of #1146 (see my comment there for explanation)