Bump version and update changelog

Author: sloria

CHANGELOG.rst

@@ -1,7 +1,7 @@
 Changelog
 ---------
 
-0.8.8 (unreleased)
+0.8.8 (2020-03-29)
 ******************
 
 Bug fixes:
@@ -43,7 +43,6 @@ Bug fixes:
 
 * Fix passing ``default_in`` argument when generating parameters (:issue:`165`).
   Thanks :user:`d42` for reporting and thanks :user:`zzz4zzz` for the fix.
->>>>>>> master
 
 0.8.3 (2019-09-17)
 ******************

flask_apispec/__init__.py

@@ -4,7 +4,7 @@
 from flask_apispec.extension import FlaskApiSpec
 from flask_apispec.utils import Ref
 
-__version__ = '0.8.7'
+__version__ = '0.8.8'
 __all__ = [
     'doc',
     'wrap_with',