]> git.stg.codes - stg.git/commit
Merge branch 'stg-2.409'
authorMaxim Mamontov <faust.madf@gmail.com>
Sat, 21 Jan 2017 19:05:30 +0000 (21:05 +0200)
committerMaxim Mamontov <faust.madf@gmail.com>
Sat, 21 Jan 2017 19:05:30 +0000 (21:05 +0200)
commitd8845c7819caac09b95c4cdf1e8d48cc1cb1b7a6
treeea9b873072c37e4f8a49705e4f4d853138d684ac
parent6c4d31bf18078de98e71575d4b032df303f23a3a
parentafcbfd1a09e22ff4839ba5db42047c96f355506c
Merge branch 'stg-2.409'
include/stg/admin_conf.h
include/stg/corp_conf.h
include/stg/user_traff.h
projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
projects/stargazer/plugins/configuration/sgconfig/configproto.h
projects/stargazer/plugins/store/files/file_store.cpp
projects/stargazer/settings_impl.h
projects/stargazer/user_impl.cpp
projects/stargazer/user_impl.h
projects/stargazer/users_impl.cpp