##// END OF EJS Templates
chore: fixed merge conflicts
chore: fixed merge conflicts

File last commit:

r3869:4174ab02
r5544:65ade690 merge v5.2.0
Show More
rcicons.woff
0 lines | 11.3 KiB | application/x-font-woff | TextLexer
/ rhodecode / public / fonts / RCIcons / rcicons.woff
Binary file (application/x-font-woff)