Merge conflicts from head.

2016-01-28 13:09:29 -05:00 · 2016-01-28 13:09:29 -05:00 · 26625f8c18
commit 26625f8c18
parent 6e3e056aac 343309d6ba
1 changed files with 1 additions and 0 deletions
--- a/update_inara.py
+++ b/update_inara.py
@ -26,6 +26,7 @@ def main():
    root.wm_title("Inara Updater")
    settings = utils.get_settings()
    app = gui.UpdateWindow(root, settings)
+    root.minsize(200, 100)
    root.mainloop()

  else: