summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2017-02-24 20:05:46 +0000
committerMicah <micah@riseup.net>2017-02-24 20:05:46 +0000
commitd9b9cce45b6f349e589c24a6442f9387f90a157d (patch)
tree0041e1216248f1c238c2efdabb653b67e105a770 /templates
parentcc0baada0d31c2732cd8c1e69abd4fdd73ae3e1c (diff)
parente6ff69485bdee11361e7be21cf1dacae19e0d90d (diff)
Merge branch 'support_concat_2.2.0' into 'master'
Subscribe to the Concat resource instead of the File one. See merge request !15
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions