Merge branch 'master' into preview

Conflicts:
	ranger/fsobject/file.py

1 files changed, 8 insertions, 6 deletions

diff --git a/doc/pydoc/ranger.ext.html b/doc/pydoc/ranger.ext.html
index afd5aeb2..80d894b8 100644
--- a/doc/pydoc/ranger.ext.html
+++ b/doc/pydoc/ranger.ext.html
@@ -21,17 +21,19 @@
 <a href="ranger.ext.command_parser.html">command_parser</a><br>
 <a href="ranger.ext.curses_interrupt_handler.html">curses_interrupt_handler</a><br>
 <a href="ranger.ext.direction.html">direction</a><br>
-</td><td width="25%" valign=top><a href="ranger.ext.get_executables.html">get_executables</a><br>
-<a href="ranger.ext.human_readable.html">human_readable</a><br>
+<a href="ranger.ext.get_executables.html">get_executables</a><br>
+</td><td width="25%" valign=top><a href="ranger.ext.human_readable.html">human_readable</a><br>
 <a href="ranger.ext.iter_tools.html">iter_tools</a><br>
 <a href="ranger.ext.keybinding_parser.html">keybinding_parser</a><br>
-</td><td width="25%" valign=top><a href="ranger.ext.mount_path.html">mount_path</a><br>
-<a href="ranger.ext.openstruct.html">openstruct</a><br>
+<a href="ranger.ext.lazy_property.html">lazy_property</a><br>
+<a href="ranger.ext.mount_path.html">mount_path</a><br>
+</td><td width="25%" valign=top><a href="ranger.ext.openstruct.html">openstruct</a><br>
 <a href="ranger.ext.shell_escape.html">shell_escape</a><br>
 <a href="ranger.ext.shutil_generatorized.html">shutil_generatorized</a><br>
-</td><td width="25%" valign=top><a href="ranger.ext.signal_dispatcher.html">signal_dispatcher</a><br>
+<a href="ranger.ext.signal_dispatcher.html">signal_dispatcher</a><br>
 <a href="ranger.ext.spawn.html">spawn</a><br>
-<a href="ranger.ext.tree.html">tree</a><br>
+</td><td width="25%" valign=top><a href="ranger.ext.tree.html">tree</a><br>
+<a href="ranger.ext.utfwidth.html">utfwidth</a><br>
 <a href="ranger.ext.waitpid_no_intr.html">waitpid_no_intr</a><br>
 </td></tr></table></td></tr></table>
 </body></html>
\ No newline at end of file