diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-25 22:47:56 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-25 22:47:56 -0400 |
commit | 2147ffa48734e50c9df1ea91ce100bf5336eacc2 (patch) | |
tree | 6970f04af670ba8aaa923727309a361465c0b031 /view/404.tpl | |
parent | 7873347c65ecf936661130392a8680dbad162056 (diff) | |
download | volse-hubzilla-2147ffa48734e50c9df1ea91ce100bf5336eacc2.tar.gz volse-hubzilla-2147ffa48734e50c9df1ea91ce100bf5336eacc2.tar.bz2 volse-hubzilla-2147ffa48734e50c9df1ea91ce100bf5336eacc2.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
typo datarry -> datarray
* master:
Diffstat (limited to 'view/404.tpl')
0 files changed, 0 insertions, 0 deletions