diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-30 13:15:53 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-30 13:16:13 -0700 |
| commit | cae1329f3bca1f5f1fbfdb1d96b38cbb790fbe00 (patch) | |
| tree | 21ae74d08b6496c7d7fafbe95a9b147a9ac56cc0 /avatar | |
| parent | 5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624 (diff) | |
| parent | f8883367184e4fd31dc819d5e1257d0eee11eb10 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/util.php
Diffstat (limited to 'avatar')
| -rwxr-xr-x[-rw-r--r--] | avatar/.gitignore | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/avatar/.gitignore b/avatar/.gitignore index e69de29bb..e69de29bb 100644..100755 --- a/avatar/.gitignore +++ b/avatar/.gitignore |