Commit Graph

449 Commits (5a8b82af3a573d180ed6ce56ba4c3c0cf487bfba)

Author SHA1 Message Date
WSO2 Builder 6fddf9c8d0 [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare for next development iteration
8 years ago
WSO2 Builder 2f4051019c [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare release v2.0.57
8 years ago
WSO2 Builder 80bf3c8fbd [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare for next development iteration
8 years ago
WSO2 Builder 2a7173c66d [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare release v2.0.56
8 years ago
WSO2 Builder 95a80301e9 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare for next development iteration
8 years ago
WSO2 Builder 236db75700 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare release v2.0.55
8 years ago
Chatura Dilan 309352df1e Merge pull request #722 from janakamarasena/mutual-ssl-handler
8 years ago
WSO2 Builder 43e76e4678 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare for next development iteration
8 years ago
WSO2 Builder 34865f0d25 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare release v2.0.54
8 years ago
Janak Amarasena 3ecb6da575 Remove unwanted code
8 years ago
Janak Amarasena e5bd7566d3 Add Mutual SSL handling to AuthHandler
8 years ago
WSO2 Builder 3a9986d054 [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare for next development iteration
8 years ago
WSO2 Builder b53610ff8b [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare release v2.0.53
8 years ago
megala21 b5e4c22c31 Merge remote-tracking branch 'upstream/master'
8 years ago
megala21 121c289b39 Adding security filters to web.xml
8 years ago
WSO2 Builder 726422dc81 [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare for next development iteration
8 years ago
WSO2 Builder 4bf6bf73cc [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare release v2.0.52
8 years ago
Ayyoob Hamza 3526e6425f Merge pull request #709 from madawas/master
8 years ago
WSO2 Builder 4429482a29 [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare for next development iteration
8 years ago
WSO2 Builder 1bbd982e1f [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare release v2.0.51
8 years ago
Madawa Soysa a7e61318b8 Fixing multitenant issue in certificate verification endpoint
8 years ago
WSO2 Builder 52b0165275 [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration
8 years ago
WSO2 Builder ada2669ecf [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50
8 years ago
WSO2 Builder 543e603298 [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration
8 years ago
WSO2 Builder 5010a3eebf [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49
8 years ago
WSO2 Builder eb8ba53092 [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration
8 years ago
WSO2 Builder 4764bff47e [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48
8 years ago
WSO2 Builder c1b5a649f6 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration
8 years ago
WSO2 Builder 6ccccb67b4 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47
8 years ago
WSO2 Builder 1ecb4edbd7 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration
8 years ago
WSO2 Builder 48a8f43cb3 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46
8 years ago
WSO2 Builder 16d97d62be [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration
8 years ago
WSO2 Builder 8891784b99 [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45
8 years ago
WSO2 Builder f7d1a7cf99 [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration
8 years ago
WSO2 Builder 4b85af950c [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44
8 years ago
WSO2 Builder b9e614e383 [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration
8 years ago
WSO2 Builder d37951ef3f [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43
8 years ago
WSO2 Builder fc15f43b31 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration
8 years ago
WSO2 Builder 27b84bfc22 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42
8 years ago
WSO2 Builder 5496159f9d [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration
8 years ago
WSO2 Builder ef94e90366 [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41
8 years ago
WSO2 Builder a826370019 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration
8 years ago
WSO2 Builder 4654a4db45 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40
8 years ago
WSO2 Builder 8b7e458592 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration
8 years ago
WSO2 Builder 6297993560 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39
8 years ago
WSO2 Builder 802c83de39 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration
8 years ago
WSO2 Builder 98dda03784 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38
8 years ago
WSO2 Builder f3e119cd78 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration
8 years ago
WSO2 Builder a8f8a49a80 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37
8 years ago
WSO2 Builder 0e5895ec78 [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration
8 years ago
WSO2 Builder d6080159cb [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36
8 years ago
WSO2 Builder 3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration
8 years ago
WSO2 Builder 6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35
8 years ago
WSO2 Builder e8ee33e7a4 [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration
8 years ago
WSO2 Builder 6cc898d2ab [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34
8 years ago
WSO2 Builder a26a4bb539 [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration
8 years ago
WSO2 Builder 000601911f [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33
8 years ago
WSO2 Builder 50c9eb9ba4 [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration
8 years ago
WSO2 Builder ca79804c5c [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32
8 years ago
WSO2 Builder a35205c480 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration
8 years ago
WSO2 Builder ac379c9bf9 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31
8 years ago
WSO2 Builder de25f3afe3 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration
8 years ago
WSO2 Builder 55ecafe7f4 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30
8 years ago
WSO2 Builder 15d57f71ad [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration
8 years ago
WSO2 Builder 3af9e1729a [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29
8 years ago
WSO2 Builder 322f39596e [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration
8 years ago
WSO2 Builder 18244d6c96 [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28
8 years ago
WSO2 Builder 12f21868dc [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration
8 years ago
WSO2 Builder 4328c3c39d [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27
8 years ago
WSO2 Builder c6bb8e0128 [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration
8 years ago
WSO2 Builder da9002ba9f [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26
8 years ago
WSO2 Builder 6114f4b2d5 [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration
8 years ago
WSO2 Builder ea8f19f26d [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25
8 years ago
WSO2 Builder d433525145 [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration
8 years ago
WSO2 Builder 35ee3eca3a [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24
8 years ago
WSO2 Builder 4e0afb7d39 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration
8 years ago
WSO2 Builder 33f1448c82 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23
8 years ago
WSO2 Builder e95e96f06c [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration
8 years ago
WSO2 Builder 5d55413e02 [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22
8 years ago
WSO2 Builder ae3300afde [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration
8 years ago
WSO2 Builder 6646c0c56f [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21
8 years ago
WSO2 Builder 21cdcdd21a [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration
8 years ago
WSO2 Builder 23be60ebd0 [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20
8 years ago
WSO2 Builder 7f98d37835 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration
8 years ago
WSO2 Builder b03936ca49 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19
8 years ago
charitha abdffdbf39 Add tenant id to Enrollment Certificate
8 years ago
charitha 14dfc1b538 Fix minor issues found with jmeter tests
8 years ago
WSO2 Builder 82888e1d20 [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration
8 years ago
WSO2 Builder b11c2e451b [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18
8 years ago
WSO2 Builder 67a091ff5a [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
8 years ago
WSO2 Builder dcc2088455 [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
8 years ago
WSO2 Builder 927b2d451d [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
8 years ago
WSO2 Builder dfe9b1ff9c [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
8 years ago
Kamidu Sachith Punchihewa 559fe98cc9 Merge pull request #585 from wso2/master
8 years ago
WSO2 Builder 54a278a1bc [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration
8 years ago
WSO2 Builder 3bc46c4d2d [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15
8 years ago
WSO2 Builder 1bc8f5c28d [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration
8 years ago
WSO2 Builder 1483503790 [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14
8 years ago
Milan Perera a5f41ef734 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
8 years ago
WSO2 Builder 5dc55bb5b5 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
8 years ago
WSO2 Builder c7fe9c3a20 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
8 years ago
WSO2 Builder c17bead1fc [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
8 years ago
WSO2 Builder 14100d3cc8 [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
8 years ago
ayyoob b42505c1fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
8 years ago
WSO2 Builder cd7e0feaa6 [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
8 years ago
WSO2 Builder abb150d9bd [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
8 years ago
ayyoob 3423ef025d merged with upstream
8 years ago
ayyoob e74b4e23c4 removed apim dependency from cdmf
8 years ago
WSO2 Builder 002fb8719b [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 04f32902fd [maven-release-plugin] prepare release v2.0.10
8 years ago
WSO2 Builder 5c207897ad [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 233d14edbd [maven-release-plugin] prepare release v2.0.9
8 years ago
WSO2 Builder eedecf00ed [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ef57fc463b [maven-release-plugin] prepare release v2.0.8
8 years ago
Rasika Perera 3a2b206fe6 Fixing certificate management api returns 403 forbidden
8 years ago
ayyoob 2a538ff959 fixed multi tenant login issue
8 years ago
WSO2 Builder 585b9bde4d [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder d206148841 [maven-release-plugin] prepare release v2.0.7
8 years ago
geethkokila bf8ab0da11 Adding support for identifying the device type from the url
8 years ago
ayyoob 671d931d3e merged with origin after resolving conflicts
8 years ago
Rasika Perera 3cc176c121 Fixing permission for certificates:verify
8 years ago
Rasika Perera 09aae93fc1 Adding perm:admin:certificates:verify scope
8 years ago
ayyoob cdd144237f removed unused parameter
8 years ago
ayyoob 2fbaf31b93 fixed permission and assigned environment variables for url context
8 years ago
Rasika Perera 83aea1fd01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
8 years ago
WSO2 Builder 5411d93103 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3ea83b925a [maven-release-plugin] prepare release v2.0.6
8 years ago
Rasika Perera 8397b688e9 Merge branch 'release-2.0.x' into mutual_ssl_feature
8 years ago
geethkokila 44c7383b15 Adding support to send ios request the synapse gateway
8 years ago
geethkokila 9200adebed Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Milan Perera 637c014866 Refactored scope strings
8 years ago
Milan Perera 157ef998a6 Resolved conflicts and merged
8 years ago
Milan Perera e0ee2fc1e5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
GPrathap 5d1435c7bc renamed permission string
8 years ago
GPrathap 0bd7b90e9a added scope annotation
8 years ago
Maninda 0fb5a577b8 Fixed some issues found in FindBugs security analysis.
8 years ago
geethkokila 65cb12b5ac Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Milan Perera 02d75b757c Fixed conflicts and merged
8 years ago
WSO2 Builder 6aea6195e9 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3db5b289ac [maven-release-plugin] prepare release v2.0.5
8 years ago
WSO2 Builder ed47094964 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8d409a7248 [maven-release-plugin] prepare release v2.0.4
8 years ago
geethkokila 1b4857b7fd Fixing conflicts
8 years ago
geethkokila 8ca28fa1fd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Rasika Perera 1465c56822 Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
8 years ago
geethkokila 8e2432c47b Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
WSO2 Builder f9b6939cb7 [WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
8 years ago
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
8 years ago
WSO2 Builder 78b9052c37 [WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
8 years ago
amalhub fe2b6b5993 IOTS-292: Adding verification services needed for gataway handler
8 years ago
Milan Perera bcbf61a886 Fixed conflicts
8 years ago
Milan Perera dd353e1bfb Commiting permission-scope mapping improvements
8 years ago
WSO2 Builder a59edee410 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8f9b21b41b [maven-release-plugin] prepare release v2.0.3
8 years ago
geethkokila b9d104e9b2 Fixing the certificate mgt issue
8 years ago
geethkokila d911281ad1 Merging master branch with release-2.0.x
8 years ago
charitha 161fe62a08 Fix for https://wso2.org/jira/browse/IOTS-323
8 years ago
WSO2 Builder 228b24ca79 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 5dbb258f55 [maven-release-plugin] prepare release v2.0.2
8 years ago
WSO2 Builder 8431b30ddc [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ae2e283f14 [maven-release-plugin] prepare release v2.0.1
8 years ago
GPrathap 6efc5bc1ed removed @API and @Permission annotations
8 years ago
WSO2 Builder 19c1b3566d [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder cff6e242c8 [maven-release-plugin] prepare release v2.0.0
8 years ago
charitha a6064d2561 Update component versions for IoTS-1.0.0 release
8 years ago
WSO2 Builder 9517a3d30f [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder a8568299b9 [maven-release-plugin] prepare release v1.2.6
8 years ago
Madawa Soysa 774eaadb71 EMM-1298: Extracting serial number from the certificate itself when adding a certificate
8 years ago
WSO2 Builder 27a2c9b979 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder eae935f91c [maven-release-plugin] prepare release v1.2.5
8 years ago
Kamidu Sachith Punchihewa 7666bbfd05 Merge pull request #395 from Megala21/master
8 years ago
WSO2 Builder 6a55e1be83 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 11c2e59f61 [maven-release-plugin] prepare release v1.2.4
8 years ago
Megala 4ec6883ec8 Merge remote-tracking branch 'upstream/master'
8 years ago
Shavindri 28cb653b06 Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
8 years ago
Megala e55b3a6d5f Fixes related to having special characters in role name
8 years ago
Shavindri c64581dc59 Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
8 years ago
Chatura Dilan Perera c16cc4cae1 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera ed4bca7032 [maven-release-plugin] prepare release v1.2.2
8 years ago
Megala 47d6268c9e Correcting the problem related with oracle syntax
8 years ago
Megala 82be4ef5a8 Fixing oracle script issues
8 years ago
amalhub 428ce25b6f Fixing issue: https://wso2.org/jira/browse/EMM-1646
8 years ago
Ace 6aad76eff1 Synching with master and updating jscep and bcpkix dependencies
8 years ago
Ace 154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
Ace f4d6eb6898 Upgrading jscep and other fixes
8 years ago
Ace 9548bdc263 Fixing dependency related issues
8 years ago
Ace 5f90587564 Synching with master
8 years ago
Chatura Dilan Perera 50d8885f8b [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera a00d6aafd4 [maven-release-plugin] prepare release v1.2.1
8 years ago
Ace 6a8a5cbd5a Merging with master
8 years ago
Ace 1dfb8e22e1 Updating to latest appm/apim/identity dependencies
8 years ago
Chatura Dilan Perera de23a8cf27 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 8905fae0d9 [maven-release-plugin] prepare release v1.2.0
8 years ago
thusithakalugamage 0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
kamidu 878daae5c5 Permission modifications
8 years ago
Chatura Dilan Perera 2d5262e21e [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 5ccd752404 [maven-release-plugin] prepare release v1.2.0
8 years ago
mharindu 115099c8fe Implemented permission based authorization
8 years ago
mharindu 24930b3042 Partial commit of migration
8 years ago
Chatura Dilan Perera 8b17cbb339 Fix conflicts
8 years ago