Commit d59107e9 authored by metzlerd's avatar metzlerd
Browse files

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

Conflicts:
	repos/reports/drupaladmin/enabled_contributions.frx
	repos/reports/drupaladmin/sample_active_users_letter.frx
parent 929ab50e
<<<<<<< HEAD
<?xml version="1.0"?>
<!DOCTYPE root [
<!ENTITY nbsp "&#160;">
]>
<html xmlns:frx="urn:FrxReports">
<head>
<title>Enabled Modules and Themes</title>
<frx:category>Drupal Administration</frx:category>
<frx:options hidden="0" form="" />
<frx:parameters>
</frx:parameters>
<frx:docgen>
</frx:docgen>
</head>
<body>
<div frx:block="drupal/enabled_modules" id="forena-1">
<table>
<thead>
<tr>
<th>name</th>
<th>owner</th>
<th>weight</th>
</tr>
</thead>
<tbody>
<tr frx:foreach="*" id="forena-2">
<td>{name}</td>
<td>{owner}</td>
<td>{weight}</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>
=======
<?xml version="1.0"?>
<!DOCTYPE root [
<!ENTITY nbsp "&#160;">
......@@ -72,4 +34,4 @@
</div>
</body>
</html>
>>>>>>> origin/7.x-4.x
......@@ -13,8 +13,6 @@
<frx:doc type="email" />
</frx:docgen>
<frx:fields>
<frx:field id="mail" link="" format="" format-string="" target="" />
<frx:field id="name" link="" format="" format-string="" target="" />
</frx:fields>
</head>
<body>
......
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