diff options
author | redmatrix <git@macgirvin.com> | 2016-04-20 19:06:36 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-04-20 19:06:36 -0700 |
commit | d2f67bf2497e4992e08ecbd2432f29ce1fd4c516 (patch) | |
tree | 8508b4b252a56c88e3ed559f1901633e699d22c8 /.openshift/pear.txt | |
parent | 8f64b28fb998558378d1a14c744a275cc19f1d55 (diff) | |
parent | 0d91f363ccda100ccf6b35f7fb46a4352d00326a (diff) | |
download | volse-hubzilla-d2f67bf2497e4992e08ecbd2432f29ce1fd4c516.tar.gz volse-hubzilla-d2f67bf2497e4992e08ecbd2432f29ce1fd4c516.tar.bz2 volse-hubzilla-d2f67bf2497e4992e08ecbd2432f29ce1fd4c516.zip |
Merge branch 'dmeta' into dev
several diaspora changes/fixes
Diffstat (limited to '.openshift/pear.txt')
0 files changed, 0 insertions, 0 deletions