-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
# Conflicts: # modman
- Loading branch information
Showing
1 changed file
with
15 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| app/code/community/* app/code/community/ | ||
| app/design/adminhtml/default/default/layout/* app/design/adminhtml/default/default/layout/ | ||
| app/design/adminhtml/default/default/template/* app/design/adminhtml/default/default/template/ | ||
| app/design/frontend/base/default/layout/* app/design/frontend/base/default/layout/ | ||
| app/design/frontend/base/default/template/* app/design/frontend/base/default/template/ | ||
| app/etc/modules/* app/etc/modules/ | ||
| js/ebizmarts/mailchimp/* js/ebizmarts/mailchimp/ | ||
| skin/adminhtml/default/default/ebizmarts/* skin/adminhtml/default/default/ebizmarts/ | ||
| getMailChimpResponse.php getMailChimpResponse.php | ||
| m4mlogs.sh m4mlogs.sh | ||
| app/code/community/Ebizmarts/MailChimp app/code/community/Ebizmarts/MailChimp | ||
| app/design/adminhtml/default/default/layout/ebizmarts/mailchimp.xml app/design/adminhtml/default/default/layout/ebizmarts/mailchimp.xml | ||
| app/design/adminhtml/default/default/template/ebizmarts/mandrill app/design/adminhtml/default/default/template/ebizmarts/mandrill | ||
| app/design/adminhtml/default/default/template/ebizmarts/mailchimp app/design/adminhtml/default/default/template/ebizmarts/mailchimp | ||
| app/design/frontend/base/default/layout/ebizmarts/mailchimp.xml app/design/frontend/base/default/layout/ebizmarts/mailchimp.xml | ||
| app/design/frontend/base/default/template/ebizmarts/mailchimp app/design/frontend/base/default/template/ebizmarts/mailchimp | ||
| app/etc/modules/Ebizmarts_MailChimp.xml app/etc/modules/Ebizmarts_MailChimp.xml | ||
| lib/Ebizmarts/Mailchimp.php lib/Ebizmarts/Mailchimp.php | ||
| lib/Ebizmarts/Mailchimp lib/Ebizmarts/Mailchimp | ||
| lib/Mandrill lib/Mandrill | ||
| js/ebizmarts/mailchimp js/ebizmarts/mailchimp | ||
| skin/adminhtml/default/default/ebizmarts/mailchimp skin/adminhtml/default/default/ebizmarts/mailchimp | ||
| skin/adminhtml/default/default/ebizmarts/mandrill skin/adminhtml/default/default/ebizmarts/mandrill | ||
| m4mlogs.sh m4mlogs.sh | ||
| getMailChimpResponse.php getMailChimpResponse.php |