Skip to content
Snippets Groups Projects
Commit 95d68223 authored by totten's avatar totten
Browse files

Merge branch 'CRM-13014' of git://github.com/eileenmcnaughton/civicrm-core into pull-request-1139

Conflicts:
	CRM/Utils/System/Base.php
	CRM/Utils/System/Drupal.php
	CRM/Utils/System/Drupal6.php

Also: Update comments

----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
  http://issues.civicrm.org/jira/browse/CRM-13014
parents d41a663e 53980972
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment