diff options
| author | intrigeri <intrigeri@boum.org> | 2008-10-20 14:34:36 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-10-20 14:34:36 +0200 |
| commit | b6a4da775945856b07fdc8f1330a86f67e329ac9 (patch) | |
| tree | 7ee389c28208e236cc4da4c3c51dbe9eae9234f0 /IkiWiki/Plugin/prettydate.pm | |
| parent | 67473ec58fbd1eebd914f2d023ee6c7a34ad47ba (diff) | |
| parent | fadb26bc1507f7fc2caaa873ad32c12f75c378aa (diff) | |
Merge branch 'prv/po' into pub/po
Diffstat (limited to 'IkiWiki/Plugin/prettydate.pm')
| -rw-r--r-- | IkiWiki/Plugin/prettydate.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm index e997be3ce..0f02142b0 100644 --- a/IkiWiki/Plugin/prettydate.pm +++ b/IkiWiki/Plugin/prettydate.pm @@ -84,7 +84,7 @@ sub checkconfig () { #{{{ } } #}}} -sub IkiWiki::displaytime ($;$) { #{{{ +sub IkiWiki::formattime ($;$) { #{{{ my $time=shift; my $format=shift; if (! defined $format) { |