##// END OF EJS Templates
merge: Resolved conflicts
merge: Resolved conflicts

File last commit:

r2623:0cd3ef36 default
r5471:df8a724f merge v5.1.0 stable
Show More
compat.py
1 line | 39 B | text/x-python | PythonLexer
code: code fixes and small adjustments
r2623 from pyramid.compat import configparser