Merge commit '154fc79e99' into develop

Browse source

Conflicts:
	classes/security/EmbedFilter.class.php
	common/js/common.js
	common/js/xe.min.js
	config/config.inc.php

...

This commit is contained in:

bnu 2014-01-06 11:23:59 +09:00

parent 33db463615 154fc79e99

commit 711cd1ea35

6 changed files with 12 additions and 37 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

common/js/xe.min.js vendored

View file

File diff suppressed because one or more lines are too long