Skip to content
Snippets Groups Projects
Commit 0ce84837 authored by Kurund Jalmi's avatar Kurund Jalmi
Browse files

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-05-17-16-30

Conflicts:
	tests/phpunit/api/v3/GroupContactTest.php
parents a5685d55 25314c39
No related branches found
No related tags found
No related merge requests found
Showing
with 437 additions and 109 deletions
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