diff options
| author | Maurice Svay <maurice@svay.com> | 2012-03-10 15:17:50 +0100 |
|---|---|---|
| committer | Maurice Svay <maurice@svay.com> | 2012-03-10 15:17:50 +0100 |
| commit | 7f7ad3a9a7e9e308862c08865e24b7777b14ed22 (patch) | |
| tree | 48178b014ff075eeaa0e86c5b9fbef61d56ad72f /admin | |
| parent | c4ff5b85f0066a0db33a876bd85963e1fa04ce83 (diff) | |
| parent | 94ac294fd91be3e5cbb2a78becfa41216848367b (diff) | |
| download | planet-7f7ad3a9a7e9e308862c08865e24b7777b14ed22.tar planet-7f7ad3a9a7e9e308862c08865e24b7777b14ed22.tar.gz planet-7f7ad3a9a7e9e308862c08865e24b7777b14ed22.tar.bz2 planet-7f7ad3a9a7e9e308862c08865e24b7777b14ed22.tar.xz planet-7f7ad3a9a7e9e308862c08865e24b7777b14ed22.zip | |
Merge branch 'html5' of https://github.com/pascalchevrel/moonmoon into pascalchevrel-html5
Conflicts:
admin/index.php
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/index.php b/admin/index.php index 4bffb15..77ba04d 100755 --- a/admin/index.php +++ b/admin/index.php @@ -75,7 +75,7 @@ ob_start(); <form action="subscriptions.php" method="post" id="feedimport"> <fieldset> <label for="url">Link:</label> - <input type="text" class="text" name="url" id="url" value="http://" class="text" size="50" /> + <input type="text" class="text" name="url" id="url" placeholder="http://" class="text" size="50" /> <input type="submit" class="submit add" name="add" value="Add feed" /> </fieldset> <p class="help">Accepted formats are RSS and ATOM. If the link is not a feed, moonmoon will try to autodiscover the feed.</p> |