]> git.stg.codes - stg.git/commitdiff
git.stg.codes / stg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6b4241 5d8864b)
Merge remote-tracking branch 'origin/ticket26' into stg-2.409
authorMaxim Mamontov <faust.madf@gmail.com>
Thu, 14 Apr 2016 17:37:49 +0000 (20:37 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Thu, 14 Apr 2016 17:37:49 +0000 (20:37 +0300)
1  2 
projects/stargazer/main.cpp patch | diff1 | diff2 | blob | history

diff --cc projects/stargazer/main.cpp
Simple merge
Stargazer Billing System