Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

6340311f

Commit 6340311f authored 11 years ago by Kurund Jalmi

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-05-11-07-08

Conflicts:
	js/Common.js
	templates/CRM/Batch/Form/Entry.tpl

parents bc0b26c5 9a03c6a7

Branches

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CRM/Batch/Form/Entry.php 1 addition, 1 deletion

CRM/Batch/Form/Entry.php
CRM/Contact/Form/NewContact.php 6 additions, 2 deletions

CRM/Contact/Form/NewContact.php
CRM/Core/I18n.php 47 additions, 0 deletions

CRM/Core/I18n.php
api/api.php 1 addition, 1 deletion

api/api.php
extern/rest.php 1 addition, 0 deletions

extern/rest.php
js/Common.js 6 additions, 1 deletion

js/Common.js
templates/CRM/Batch/Form/Entry.tpl 360 additions, 0 deletions

templates/CRM/Batch/Form/Entry.tpl

with 422 additions and 5 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 sign in to comment