aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/404.tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-06 02:37:06 -0800
committerfriendica <info@friendica.com>2014-01-06 02:37:06 -0800
commit196b3022bd8759428d04d8d3bcf10c27d7c3b329 (patch)
treeba785f204e8616af5751d7303d3357c75b9d30bc /view/tpl/404.tpl
parent0c85c9748096d625ae9baa29fb9aad48bab3a208 (diff)
parentae8a30273a6b787985d06fa776d1726d4427f9be (diff)
downloadvolse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.gz
volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.bz2
volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.zip
Merge branch 'master' into movejs
Conflicts: version.inc
Diffstat (limited to 'view/tpl/404.tpl')
0 files changed, 0 insertions, 0 deletions