Merge branch 'develop' into feature/updatecharsetmetatag

Conflicts:
	index.html
	info/index.html
This commit is contained in:
Manuel Friedli 2015-01-15 17:20:32 +01:00
commit 057d2a51a8
3 changed files with 2 additions and 37 deletions

View file

@ -13,7 +13,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<html manifest="manifest.appcache" lang="de">
<html lang="de">
<head>
<title>Bärneruhr - Die Zeit im Wort</title>
<meta charset="utf-8"/>