resolve conflict

master
Foxbot 10 years ago
commit bdc99c2fd1

@ -2,3 +2,11 @@ Popcorn Time Website
======================
### The site is [get-popcorn.com](http://get-popcorn.com)
***
### Site translations
We don't accept pull request for translations.
Please use: [http://www.getlocalization.com/PopcornTime/](http://www.getlocalization.com/PopcornTime/)

@ -68,7 +68,7 @@
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon">
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
<title><?=$langsite["TITLE_DLS"]?> - Popcorn Time</title>
<title><?=$langsite["TITLE_DL"]?> - Popcorn Time</title>
<meta name="description" content="<?=$langsite["SITE_DESC"]?>">
<link rel="image_src" href="images/header-ui.jpg">

Loading…
Cancel
Save