projects / platform / core / api / webapi-plugins.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 56004c5 6c1109c)
Merge branch 'tizen_3.0' into tizen_4.0 65/152965/1 accepted/tizen/4.0/unified/20170929.075732 submit/tizen_4.0/20170927.114247
authorPiotr Kosko <p.kosko@samsung.com>
Wed, 27 Sep 2017 11:26:28 +0000 (13:26 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Wed, 27 Sep 2017 11:26:28 +0000 (13:26 +0200)
commitabb2180dab36e30adff8bc0280e23918ed12098e
treea34cfc4a35b7203022e209d098e794a8eaf28ecdtree | snapshot
parent56004c528216987a91baf34629002a3c0d435197commit | diff
parent6c1109c03b8b7e9804a54c13437a2cc00b947924commit | diff
Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
packaging/webapi-plugins.spec

Change-Id: I4396c1ca3a1415cfbe4cd9ca0edc9351b5053615
packaging/webapi-plugins.spec diff1 | diff2 | blob | history
Domain: Web Framework / Web API;