aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy-dark/profile_vcard.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-31 22:46:13 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-31 22:46:13 -0400
commited8c5954a9189569a94e9a519f86ca2c8c88db50 (patch)
tree1fdb0401ee9bf7156477841d8d69f8316122499e /view/theme/dispy-dark/profile_vcard.tpl
parent6b086cd266f5e93c5b254f7a661747d889169505 (diff)
parente6fd6bfd89ada9b5aeea8fcac1614546deba85aa (diff)
downloadvolse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.tar.gz
volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.tar.bz2
volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: more error handling ensure all new users get a timezone. We'll use UTC until they choose otherwise. handle escaped file chars in display and search escape % in file_tag_query as it is ultimately embedded in a sprintf diabook-themes: move "common tabs" to left side on settings page move the common tabs to right_aside in diabook-derivates register hooks for a COPA plugin some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus bug fix in diabook-aerith and -red bug-fixes in diabook-derivates settings for unknown private mail acceptance * master:
Diffstat (limited to 'view/theme/dispy-dark/profile_vcard.tpl')
0 files changed, 0 insertions, 0 deletions