Merge conflicts from head.

This commit is contained in:
Anna Rose 2016-01-28 13:09:29 -05:00
commit 26625f8c18

View File

@ -26,6 +26,7 @@ def main():
root.wm_title("Inara Updater") root.wm_title("Inara Updater")
settings = utils.get_settings() settings = utils.get_settings()
app = gui.UpdateWindow(root, settings) app = gui.UpdateWindow(root, settings)
root.minsize(200, 100)
root.mainloop() root.mainloop()
else: else: