tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2026-08-05 06:37:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
755 Commits 1 Branch 0 Tags
2d01e963693a853b6eb7aee71195bf7af3de77bc
Commit Graph
13 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Pallister f9dc8659c0 forgot to update docs 2018-04-18 08:48:21 +01:00
Tom Pallister 2791cef0e0 merged develop 2018-04-18 08:32:15 +01:00
Tom Pallister 2b8c905a26 #296 remembered how to regex 2018-04-18 08:27:23 +01:00
Tom Pallister e94df4749c #296 change so tests pass on windows 2018-04-17 21:51:41 +01:00
Tom Pallister 3ae2b286ab #296 coming up with ideas for this config merging 2018-04-15 09:20:52 +01:00
Tom Pallister 7ca828836a #296 started writing merge code 2018-04-14 07:02:17 +01:00
Tom Pallister fe9bca7b77 removed another pointless abstraction 2018-04-14 06:32:00 +01:00
Tom Pallister fe5662f954 refactoring to consolidate configuration code 2018-04-13 22:47:50 +01:00
Tom Pallister f88e1f65ef removed some async we dont need 2018-04-13 17:16:43 +01:00
Tom Pallister 060dd1dc78 another file we dont need 2018-04-13 12:36:43 +01:00
Tom Pallister 698541eb69 removed things we dont need for tests 2018-04-13 12:34:34 +01:00
Tom Pallister cbaa2c3096 #296 renamed configuration.json to ocelot.json in preparation 2018-04-13 11:23:44 +01:00
Tom Pallister 0073a6f550 Merge branch 'release/5.5.0' 2018-04-07 12:08:35 +01:00