diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-10 17:55:40 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-10 17:55:40 +0000 |
| commit | b201dabbfdf598f0d300bc9682444bd435611063 (patch) | |
| tree | 5e4b05f3526d7566cf3cba3b33e00db6d7d39038 /util/datetime.lua | |
| parent | aa43aec46ef41d3bb5f398d10cb28aafa7502b5d (diff) | |
| parent | 74f4177db0d98a050df1693c5f3b061559865a64 (diff) | |
| download | prosody-b201dabbfdf598f0d300bc9682444bd435611063.tar.gz prosody-b201dabbfdf598f0d300bc9682444bd435611063.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/datetime.lua')
| -rw-r--r-- | util/datetime.lua | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/util/datetime.lua b/util/datetime.lua index 27f28ace..abb4e867 100644 --- a/util/datetime.lua +++ b/util/datetime.lua @@ -12,7 +12,6 @@ local os_date = os.date; local os_time = os.time; local os_difftime = os.difftime; -local error = error; local tonumber = tonumber; local _ENV = nil; |