##// END OF EJS Templates
merge-logic: improve merge failed because of conflicts message.
merge-logic: improve merge failed because of conflicts message.
marcink -
r1345:b48f493b default
Show More
Name Size Modified Last Commit Author
/ rhodecode / authentication / plugins
__init__.py Loading ...
auth_crowd.py Loading ...
auth_headers.py Loading ...
auth_jasig_cas.py Loading ...
auth_ldap.py Loading ...
auth_pam.py Loading ...
auth_rhodecode.py Loading ...
auth_token.py Loading ...