aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/README.md
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-28 16:49:12 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-28 16:49:12 -0400
commit91c1a2943badc32b521acd5cc933a236ca6f5c0f (patch)
tree712f5ca55e28314d4758ff7680b887a0cda1f24c /view/theme/dispy/README.md
parent24f5e6b3f3f1f29cce8923c38fbdfb24fa5ed5a5 (diff)
parent6962989e52f0ce442fbb3e59992eeb528faa12da (diff)
downloadvolse-hubzilla-91c1a2943badc32b521acd5cc933a236ca6f5c0f.tar.gz
volse-hubzilla-91c1a2943badc32b521acd5cc933a236ca6f5c0f.tar.bz2
volse-hubzilla-91c1a2943badc32b521acd5cc933a236ca6f5c0f.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: slackr - tone down the shadows a smidgin add plugin hooks to gender, sexpref, and marital selectors birthday in november,december bug rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. handle multiple underscores in D* links * master:
Diffstat (limited to 'view/theme/dispy/README.md')
0 files changed, 0 insertions, 0 deletions