diff options
author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /plugins/Gravatar/README | |
parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/Gravatar/README')
-rw-r--r-- | plugins/Gravatar/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Gravatar/README b/plugins/Gravatar/README index 9337e24a0..263904808 100644 --- a/plugins/Gravatar/README +++ b/plugins/Gravatar/README @@ -10,4 +10,4 @@ addPlugin('Gravatar', array()); ToDo: Site default all on for gravatar by default Migration Script -Localize
\ No newline at end of file +Localize |