jebsolutions aa12c13056 include stderr in git pull results and check for error (#2104) ...

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.

2016-11-20 13:55:12 -07:00

..

apps

Menu Manager: Add ability to customize main and sub menu icons.

2016-05-02 14:42:06 -06:00

authentication

Update ldap.php

2016-11-02 00:34:18 -06:00

databases

Cleanup the indentation ... tabs and whitespace after the last pull request.

2016-04-28 16:56:44 -06:00

default_settings

email/fax fixes for 4.2 branch (#2022)

2016-10-31 14:21:26 -06:00

domain_settings

Theme: Integrate ability to use Google Fonts.

2016-05-05 12:57:08 -06:00

events/resources/classes

\r\n --> \n

2016-04-25 20:30:23 -05:00

install

Update install_switch.php

2016-10-31 23:47:10 -06:00

menu

Update menu_item_edit.php

2016-08-05 09:16:42 -06:00

notifications

Cleanup the indentation ... tabs and whitespace after the last pull request.

2016-04-28 16:56:44 -06:00

upgrade

include stderr in git pull results and check for error (#2104)

2016-11-20 13:55:12 -07:00

user_settings

user dashboard generates errors in httpd error log (#1873)

2016-09-03 20:25:41 -06:00

users

Music on Hold: Support multiple global categories. Support for changing moh domain. Support for managing additional stream parameters (shuffle, stereo, interval, chimes, custom moh paths, etc). Enhanced file system housekeeping.

2016-06-21 15:56:15 -06:00