diff options
| author | gebele <gebele@alfadeo.de> | 2011-07-26 12:22:48 +0200 |
|---|---|---|
| committer | gebele <gebele@alfadeo.de> | 2011-07-26 12:22:48 +0200 |
| commit | bceeaaf48bb24dd2f621a1a7d77939bdf0008b1e (patch) | |
| tree | 0c544a9b906777eea50040f8b6be9d9f7e2be349 | |
| parent | 4ddda667a9a0c8ceb90eedf1fc0f1aeeac0a80f5 (diff) | |
| parent | 091957683d81ab84412581dea062e1294fc00a33 (diff) | |
Merge branch 'development' into feature/policy
| -rw-r--r-- | views/layout.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/layout.haml b/views/layout.haml index 6f6afcb..d20b964 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -60,5 +60,5 @@ 2009-2011, powered by %a{:href => 'http://www.opentox.org', :rel => "external"} <span style="color:#5D308A;font-family:arial,sans-serif,helvetica;letter-spacing:-1px;">Open</span><span style="color:#000;font-family:arial,sans-serif,helvetica;font-weight:bold;letter-spacing:-1px;">Tox</span> (a project funded by the - %a{:href => "http://cordis.europa.eu/fp7/"} 7th Framework Programme + %a{:href => "http://cordis.europa.eu/fp7/", :rel => "external"} 7th Framework Programme of the European Commission) |