Commit d59107e9 authored by metzlerd's avatar metzlerd
Browse files

Merge remote-tracking branch 'origin/7.x-4.x' into 7.x-4.x

parent 929ab50e
<<<<<<< HEAD
<?xml version="1.0"?>
<!DOCTYPE root [
<!ENTITY nbsp "&#160;">
<html xmlns:frx="urn:FrxReports">
<title>Enabled Modules and Themes</title>
<frx:category>Drupal Administration</frx:category>
<frx:options hidden="0" form="" />
<div frx:block="drupal/enabled_modules" id="forena-1">
<tr frx:foreach="*" id="forena-2">
<?xml version="1.0"?>
<!DOCTYPE root [
<!ENTITY nbsp "&#160;">
......@@ -72,4 +34,4 @@
>>>>>>> origin/7.x-4.x
......@@ -13,8 +13,6 @@
<frx:doc type="email" />
<frx:field id="mail" link="" format="" format-string="" target="" />
<frx:field id="name" link="" format="" format-string="" target="" />
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment