Skip to content
Snippets Groups Projects
Commit 6b253248 authored by totten's avatar totten
Browse files

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-16-02-28-05

Conflicts:
	css/civicrm.css
parents d612c2a6 60ebf313
No related branches found
No related tags found
No related merge requests found
Showing
with 120 additions and 46 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