Skip to main content Skip to search

Commit 138f9bc1b43ec689c063eabc3e607306575b731b

Author date: November 16, 2012 22:08

November 16, 2012 22:08

Commit 138f9bc on 7.x-3.x

by levelos

Custom text: salesforce: /modules/salesforce_mapping/includes/salesforce_mapping.admin.inc

++++---

36 additions & 32 deletions

Custom text: salesforce: /modules/salesforce_mapping/includes/salesforce_mapping.fieldmap_type.inc

+++++--

20 additions & 10 deletions

Custom text: salesforce: /modules/salesforce_pull/salesforce_pull.module

+++++--

8 additions & 3 deletions

Custom text: salesforce: /modules/salesforce_push/salesforce_push.module

++--

2 additions & 2 deletions
```
Merge conflict, again!!!
```