• Yorick Peterse's avatar
    Manual merge of CE master into EE master · 2451a783
    Yorick Peterse authored
    The merge train could not automatically merge CE into EE due to a
    changelog file being removed in CE while it was modified in EE. To
    resolve this, we removed the changelog file from EE as well.
    2451a783
user_auth_finders.rb 5.31 KB