aboutsummaryrefslogtreecommitdiffstats
path: root/view/fr/htconfig.tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-21 17:13:48 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-21 17:13:48 -0700
commitc90f14c066d0f289bd2220bb66325db12700aa57 (patch)
tree6c915ad03936d479d1d807540bbc0e7ae0f854ad /view/fr/htconfig.tpl
parent24ec104819bbc3778a159ea4790398988a6e2fd7 (diff)
parent3ec6a431b62c20952f07f889acfeedd0ac456d04 (diff)
downloadvolse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.gz
volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.bz2
volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: doc/to_do_code.bb
Diffstat (limited to 'view/fr/htconfig.tpl')
0 files changed, 0 insertions, 0 deletions