diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-02 12:49:00 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-02 12:49:00 -0400 |
commit | 02dc116a9c646ea5683b8df199a7ff492ae6cfcb (patch) | |
tree | ae81849bd1bcd92acd2040cb65e3b193ec5aabb8 /.htaccess | |
parent | b3680c0d266f06d2474cb45750b0486d246a8315 (diff) | |
parent | 6875f54647cbbdb66e6d570cbf357a8b83644fad (diff) | |
download | volse-hubzilla-02dc116a9c646ea5683b8df199a7ff492ae6cfcb.tar.gz volse-hubzilla-02dc116a9c646ea5683b8df199a7ff492ae6cfcb.tar.bz2 volse-hubzilla-02dc116a9c646ea5683b8df199a7ff492ae6cfcb.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
diabook-theme: tryied to improve performance a bit
diabook-theme: fix footer/impressum
missing param
provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
delineate the new profile changes from the rest of the text
how did that happen?
shuffle results of remote_common_friends widget
only validate once
perform basic validation
* master:
Diffstat (limited to '.htaccess')
0 files changed, 0 insertions, 0 deletions