diff options
author | Juanjo Benages <juanjo@benages.eu> | 2016-01-17 19:31:49 +0100 |
---|---|---|
committer | Juanjo Benages <juanjo@benages.eu> | 2016-01-17 19:31:49 +0100 |
commit | 9c0f0ec5c5b19152fd29519fb6df8d954ff5454a (patch) | |
tree | 82daee34f6ed157496f43982942a9cee8b0835e6 | |
parent | 23aed1cd4c03c90ddf6c5dfe00c23eb906c3cba8 (diff) | |
parent | e462972e188c0b82d3e209044d5c3788d6c78cad (diff) | |
download | wallabag-9c0f0ec5c5b19152fd29519fb6df8d954ff5454a.tar.gz wallabag-9c0f0ec5c5b19152fd29519fb6df8d954ff5454a.tar.zst wallabag-9c0f0ec5c5b19152fd29519fb6df8d954ff5454a.zip |
Merge remote-tracking branch 'upstream/dev' into dev
-rwxr-xr-x | install/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/install/index.php b/install/index.php index f5bce50d..014fd3b4 100755 --- a/install/index.php +++ b/install/index.php | |||
@@ -704,7 +704,7 @@ php composer.phar install</code></pre> | |||
704 | <li><label for="mysql_password">Password</label> <input type="password" placeholder="p4ssw0rd" id="mysql_password" name="mysql_password" /></li> | 704 | <li><label for="mysql_password">Password</label> <input type="password" placeholder="p4ssw0rd" id="mysql_password" name="mysql_password" /></li> |
705 | <li><label for="mysql_utf8_mb4">Use UTF-8 MB4</label> <input id="mysql_utf8_mb4" type="checkbox" name="mysql_utf8_mb4"> | 705 | <li><label for="mysql_utf8_mb4">Use UTF-8 MB4</label> <input id="mysql_utf8_mb4" type="checkbox" name="mysql_utf8_mb4"> |
706 | <div id="utf8_mb4_infos"><em>Warning :</em> UTF-8 MB4 is used to fully support unicode characters. It is available only with MySQL starting with version 5.5.3. | 706 | <div id="utf8_mb4_infos"><em>Warning :</em> UTF-8 MB4 is used to fully support unicode characters. It is available only with MySQL starting with version 5.5.3. |
707 | Install will failed if you check this while using an older MySQL server.</div></li> | 707 | Install will fail if you check this while using an older MySQL server.</div></li> |
708 | </ul> | 708 | </ul> |
709 | <?php } else { ?> | 709 | <?php } else { ?> |
710 | <div class="messages notice"> | 710 | <div class="messages notice"> |