Merge branch 'master' of github.com:gogits/gogs

templates/user/reset_passwd.tmpl

@@ -19,7 +19,7 @@
             </div>
         </div>
         {{else}}
-        <p>Sorry, your confirmation code has exipired or is not valid.</p>
+        <p>Sorry, your confirmation code has expired or is not valid.</p>
         {{end}}
     </form>
 </div>