3 Commits (b48cad6a2aa4811b65c230ed448c3cc083b9516a)

Author SHA1 Message Date
Lunny Xiao d151503d34 Upgrade xorm to v0.8.0 (#8536) 6 years ago
Lunny Xiao 85202d4784
Display ui time with customize time location (#7792) 6 years ago
Julian 4a685f8b87 Add rebase with merge commit merge style (#3844) (#4052) 6 years ago
Lauris BH 8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 7 years ago