]> 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>
Thu, 14 Nov 2013 20:01:45 +0000 (22:01 +0200)
commit64b687f8ec36a103865044613cb0f42f98aeda3a
treeb048bb18cfa1bf5290de1b8cbf3cd8eb9aab2cfa
parentae21e8d6ad32d0bf3517127aef5cd8129b7507aa
parent60995b1933ff94757d2d29629f324d16070de1ea
Merge branch 'log-unauth-reasons'

Conflicts:
projects/stargazer/user_impl.cpp
include/stg/users.h
projects/stargazer/main.cpp
projects/stargazer/user_impl.cpp
projects/stargazer/user_impl.h
projects/stargazer/users_impl.cpp
projects/stargazer/users_impl.h