jebsolutions dd8385f63b [master] include stderr in git pull results and check for error (#2105) ... * [master] include stderr in git pull results and check for error Old result (seems correct but actually failed): Updating d190f6a..d958bea Corrected result (includes failure message): Updating d190f6a..d958bea error: Your local changes to the following files would be overwritten by merge: app/fax/fax_log_view.php Please, commit your changes or stash them before you can merge. * tab fixes		2016-11-20 13:54:57 -07:00
..
app_config.php	Added Switch upgrade as a separate option	2015-12-01 14:32:58 +00:00
app_defaults.php	moved upgrade function from app_defaults	2015-11-26 18:24:09 +00:00
app_languages.php	First pass on core/*	2015-12-10 10:09:07 +00:00
app_menu.php	Add latest translations	2015-06-29 22:30:02 +00:00
index.php	[master] include stderr in git pull results and check for error (#2105)	2016-11-20 13:54:57 -07:00
root.php	Cleanup the indentation ... tabs and whitespace after the last pull request.	2016-04-28 16:56:44 -06:00
upgrade.php	Cleanup the indentation ... tabs and whitespace after the last pull request.	2016-04-28 16:56:44 -06:00
upgrade_domains.php	fixes so cli installs/upgrades work.	2016-04-25 21:26:26 -05:00
upgrade_schema.php	missing text class include	2015-02-28 01:31:24 +00:00