projects / platform / core / api / cordova-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2901196 841a70f)
Merge branch 'tizen_3.0' into tizen_4.0 89/171389/2
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 2 Mar 2018 09:09:42 +0000 (10:09 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 2 Mar 2018 09:09:48 +0000 (10:09 +0100)
Conflicts:
packaging/cordova-api.spec

Change-Id: I6ce9327e17645c3af41d0409aa8e49175a5e104c


Trivial merge
Domain: Web Framework / Web API;