projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d41a663 5398097)
Merge branch 'CRM-13014' of git://github.com/eileenmcnaughton/civicrm-core into pull...
authorTim Otten <totten@civicrm.org>
Fri, 26 Jul 2013 03:01:19 +0000 (20:01 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 26 Jul 2013 03:01:19 +0000 (20:01 -0700)
commit95d68223ab15e3dc0e57d517e33545f32b9b0a11
tree7fbbe994565532ad5dd8a8641331d68da28d0595tree | snapshot (zip tar.gz)
parentd41a663edaf8436b70e83d9e3cdbab9bfaaf78d3commit | diff
parent5398097273290e0ca70999083bfaef91f4994fedcommit | diff
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
CRM/Utils/System/Base.php diff1 | diff2 | blob | history
CRM/Utils/System/Drupal.php diff1 | diff2 | blob | history
CRM/Utils/System/Drupal6.php diff1 | diff2 | blob | history