aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-04 02:14:26 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-04 02:14:26 -0400
commit2871e28df702f32fc780a84642f101931907d458 (patch)
tree3d1e6ce8c5f044467d95844328ac15a4c6e79d0a /.gitmodules
parent06942b36549668eb067650831f286d96aab14a40 (diff)
parent8e928d101b628c5f562cee840882892f05a1b838 (diff)
downloadvolse-hubzilla-2871e28df702f32fc780a84642f101931907d458.tar.gz
volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.tar.bz2
volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: display settings hooks re-opened bug #363 this is better include contact_widgets for categories_widget when doing updates remove loozah themes which fell too far behind to recover smal fix german translation for right_aside make right_aside translatable and provide german translation... and some css-fixes suppress duplicates in search make contact ssl_policy change a function since it is used in a few places more ssl policy fixes and prevent delivery to soapbox when using local delivery don't change ssl settings on local photos for remote contact * master:
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions