diff options
Diffstat (limited to 'lib/gitano.lua')
-rw-r--r-- | lib/gitano.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitano.lua b/lib/gitano.lua index 38c22ef..5354a0f 100644 --- a/lib/gitano.lua +++ b/lib/gitano.lua @@ -41,9 +41,13 @@ local supple = require 'gitano.supple' local auth = require 'gitano.auth' local plugins = require 'gitano.plugins' local i18n = require 'gitano.i18n' +<<<<<<< HEAD local patterns = require 'gitano.patterns' +======= +local hooks = require 'gitano.hooks' +>>>>>>> dsilvers/hooks -local _VERSION = {1, 0, 0} +local _VERSION = {1, 1, 0} _VERSION.major = _VERSION[1] _VERSION.minor = _VERSION[2] _VERSION.patch = _VERSION[3] @@ -70,4 +74,5 @@ return { plugins = plugins, i18n = i18n, patterns = patterns, + hooks = hooks, } |