diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 00:50:34 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 00:50:34 -0400 |
| commit | b361bcea83140c28b5a5677905405de0ac102791 (patch) | |
| tree | 5097892590d1c47371421ab44b867f00081278bc /include/delivery.php | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-b361bcea83140c28b5a5677905405de0ac102791.tar.gz volse-hubzilla-b361bcea83140c28b5a5677905405de0ac102791.tar.bz2 volse-hubzilla-b361bcea83140c28b5a5677905405de0ac102791.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
* master:
Diffstat (limited to 'include/delivery.php')
0 files changed, 0 insertions, 0 deletions