]> git.stg.codes - stg.git/commit
Merge branch 'log-unauth-reasons'
authorMaxim Mamontov <faust.madf@gmail.com>
Thu, 14 Nov 2013 20:01:45 +0000 (22:01 +0200)
committerMaxim Mamontov <faust.madf@gmail.com>
Fri, 9 Jan 2015 19:49:18 +0000 (21:49 +0200)
commit793728a58d8f97daf7de1dde7a02a5c4a30e30d4
treefb4c6cd99774f2b91c55f4fa99253afd3ffe717b
parent0d37dfa5f5a3d46ce814f63bb8f468971fd0904c
Merge branch 'log-unauth-reasons'

Conflicts:
projects/stargazer/user_impl.cpp
include/stg/users.h
include/stg/utime.h
projects/stargazer/main.cpp
projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
projects/stargazer/user_impl.cpp
projects/stargazer/user_impl.h
projects/stargazer/users_impl.cpp
projects/stargazer/users_impl.h