These are chat archives for OrchardCMS/AdminTheme

Nov 2016
Jasmin Savard
Nov 29 2016 23:05
is'nt that pretty? :)
no big merge issues found
time to order some poutine to celebrate :)
Antoine Griffard
Nov 29 2016 23:12
Jasmin Savard
Nov 29 2016 23:17
Anyone else has merged this code with the dev branch previously? I'm impressed that I got only around 20 files with merge issues.
I mean pushing the admin-theme branch on top of the dev branch.