backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es17.01

Browse Source 
# Conflicts:
#	examples/demo/demo.ecf
#	modules/admin/admin-safe.ecf
This commit is contained in:
Jocelyn Fiat
2017-03-30 12:03:41 +02:00
parent 5ca9a0cd85 3072b99151
commit c261554a39
27 changed files with 815 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/embedded_video/embedded_video-safe.ecf Normal file
View File

@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" uuid="1469E34C-98EE-4E39-BC13-24A0D93A7EC0" message="Obsolete: use embedded_video.ecf !" location="embedded_video.ecf">
</redirection>