[Pkg-mozext-commits] [adblock-plus] 37/41: Merge branch 'master' of https://github.com/adblockplus/adblockplusui
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 18:21:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit beb4e1f4017e4a02a5bbad741c729cac41f87d58
Merge: 4f36d30 7ebacdc
Author: David Prévot <taffit at debian.org>
Date: Wed Mar 18 13:43:53 2015 -0400
Merge branch 'master' of https://github.com/adblockplus/adblockplusui
adblockplusui/background.js | 4 +
adblockplusui/firstRun.html | 153 +++++++++++++++++-----------------
adblockplusui/firstRun.js | 11 +++
adblockplusui/i18n.js | 25 +++---
adblockplusui/locale/fr/firstRun.json | 2 +-
adblockplusui/messageResponder.js | 11 ++-
adblockplusui/skin/abp-128.png | Bin 0 -> 7768 bytes
adblockplusui/skin/abp-icon-big.png | Bin 15201 -> 0 bytes
adblockplusui/skin/firstRun.css | 25 ++++--
9 files changed, 129 insertions(+), 102 deletions(-)
diff --cc adblockplusui/skin/abp-128.png
index 0000000,1caffd0..1caffd0
mode 000000,100644..100644
Binary files differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list