aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/settings_nick_set.tpl
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-03-14 22:50:30 +0000
committerThomas Willingham <founder@kakste.com>2013-03-14 22:50:30 +0000
commitd07971b909363dd82faee3e4b5a218cb21d376dc (patch)
tree1d4b76c4ed24bf3c8cbb81c73069eb8ab4b2644c /view/tpl/settings_nick_set.tpl
parentfbc5260995866c280fbc48bfb7899836f46136f4 (diff)
parentffcba3db81d85ae8bdc56f1772c7675aef56c78e (diff)
downloadvolse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.gz
volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.bz2
volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl/settings_nick_set.tpl')
0 files changed, 0 insertions, 0 deletions