| commit | eb224ad6df97adfe8c93bb13e61d1743c94271bc | [log] [tgz] |
|---|---|---|
| author | Christopher Frost <cfrost@gopivotal.com> | Fri May 17 15:59:25 2013 +0100 |
| committer | Christopher Frost <cfrost@gopivotal.com> | Fri May 17 15:59:25 2013 +0100 |
| tree | 22e96451142bc5f69f80d09b2442e4a80a66d7e8 | |
| parent | 006c45295d60e81ab4e1ccd6d82ed7037e39d38d [diff] | |
| parent | 31ec508c01c746c324a38c10669c82364d4b3d3a [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/www.eclipse.org/ebr Conflicts: index.php
diff --git a/index.php b/index.php index 63f6e0d..d37a016 100755 --- a/index.php +++ b/index.php
@@ -69,4 +69,4 @@ # Generate the web page $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html); -?> \ No newline at end of file +?>