Merge remote-tracking branch 'refs/remotes/origin/bugfix/popup_track'

Conflicts:
	MVMCore/MVMCore/AlertHandling/MVMCoreAlertHandler.h
	MVMCore/MVMCore/AlertHandling/MVMCoreAlertHandler.m
This commit is contained in:
Chris Yang 2018-10-30 12:22:26 -04:00
commit beb59b5a92

View File

@ -42,6 +42,7 @@
* @param alertObject The origonal alertObject
* @param title The title of the alert.
* @param message The message of the alert.
* @param pageType The page type used for tracking.
* @param actions An array of actions for the alert.
* @param alertStyle Popup or action sheet
* @param isGreedy Sets up a greedy alert. In other words, any alerts currently shown or queued are dismissed.