diff options
| author | Kevin Chabowski <kevin@kch42.de> | 2013-10-04 00:13:43 +0200 |
|---|---|---|
| committer | Kevin Chabowski <kevin@kch42.de> | 2013-10-04 00:13:43 +0200 |
| commit | 08c659d208f65b6f3db3ae3d34843adef454e398 (patch) | |
| tree | 425d6d8cab0c230e4490a3ea48718adab6284d74 | |
| parent | cb2fad2b1c6a173e6f20ef48a29b3bbe491d6f5e (diff) | |
| parent | 1d584b981defe7f0ec5a609a0012a963b218fd51 (diff) | |
| download | ratatoeskr-cms-08c659d208f65b6f3db3ae3d34843adef454e398.tar.gz ratatoeskr-cms-08c659d208f65b6f3db3ae3d34843adef454e398.tar.bz2 ratatoeskr-cms-08c659d208f65b6f3db3ae3d34843adef454e398.zip | |
Merge branch 'master' into develop
| -rwxr-xr-x | ratatoeskr/templates/src/systemtemplates/backend_login.html | 2 | ||||
| -rwxr-xr-x | ratatoeskr/templates/src/systemtemplates/master.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ratatoeskr/templates/src/systemtemplates/backend_login.html b/ratatoeskr/templates/src/systemtemplates/backend_login.html index 251af98..8c26b83 100755 --- a/ratatoeskr/templates/src/systemtemplates/backend_login.html +++ b/ratatoeskr/templates/src/systemtemplates/backend_login.html @@ -9,7 +9,7 @@ <body> <img id="background_image" src="$rel_path_to_root/ratatoeskr/cms_style/images/login_bg.jpg" alt="" /> <div id="main"> - <div id="bar_top"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.1 β 5)</div> + <div id="bar_top"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.2 β 2)</div> <div class="vcenter_outer"><div class="vcenter_inner"> <div id="login_box"> <h1><ste:get_translation for="login_form_header" /></h1> diff --git a/ratatoeskr/templates/src/systemtemplates/master.html b/ratatoeskr/templates/src/systemtemplates/master.html index bce92b1..161b75d 100755 --- a/ratatoeskr/templates/src/systemtemplates/master.html +++ b/ratatoeskr/templates/src/systemtemplates/master.html @@ -40,7 +40,7 @@ </head> <body> <div id="bar_top"> - <span class="branding"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.1 β 5)</span> + <span class="branding"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.2 β 2)</span> <span class="user"> <a href="$rel_path_to_root/backend/admin/users/u/$user[id]">$user[name]</a> | <a href="$rel_path_to_root/backend/logout"><ste:get_translation for="logout" /></a> </span> |