This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, feature/twig-template-engine has been updated
via 33a1e60adf7b6721cce1ab12241de53a3710dea5 (commit)
via 516235948a636cffb559e9737457ce5624acc80f (commit)
via 0e79953bdc6f820b2da0efa662b8c7f5627a1214 (commit)
via 15453199a106e001a81f871e260376dffeaba2f0 (commit)
via acef605ba34264f3f391ddc6feb827747a9fe911 (commit)
from 45c21a506136fc014ccd3a77f255c07864479bc1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=33a1e60adf7b6721cce1ab12241de53a3710dea5
commit 33a1e60adf7b6721cce1ab12241de53a3710dea5
Merge: 45c21a5 5162359
Author: Roland Mas <[email protected]>
Date: Fri Oct 7 13:10:22 2016 +0200
Merge branch 'master' into feature/twig-template-engine
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmgit/common/GitPlugin.class.php | 2 +-
src/vendor/iframe-resizer/iframeResizer.contentWindow.min.js | 10 ----------
src/vendor/iframe-resizer/iframeResizer.min.js | 9 ---------
src/vendor/jquery-livequery/jquery.livequery.min.js | 11 -----------
src/www/account/change_email-complete.php | 2 +-
src/www/account/lostlogin.php | 2 +-
src/www/account/unsubscribe.php | 2 +-
src/www/account/verify.php | 2 +-
src/www/docman/index.php | 6 ++++++
src/www/include/html.php | 4 ++--
10 files changed, 13 insertions(+), 37 deletions(-)
delete mode 100644 src/vendor/iframe-resizer/iframeResizer.contentWindow.min.js
delete mode 100644 src/vendor/iframe-resizer/iframeResizer.min.js
delete mode 100644 src/vendor/jquery-livequery/jquery.livequery.min.js
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
