rajitha
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3582 Commits
10 Branches
250 Tags
410 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '55639694f6'
${ noResults }
Commit Graph

605 Commits (55639694f64b7789f26d3b84e444e02c03c7603b)

Author SHA1 Message Date
WSO2 Builder 164cf68fd1 [WSO2 Release] [Jenkins #2817] [Release 4.0.14] prepare release v4.0.14
8 years ago
WSO2 Builder 7707d14209 [WSO2 Release] [Jenkins #2814] [Release 4.0.13] prepare for next development iteration
8 years ago
WSO2 Builder ebd06268d3 [WSO2 Release] [Jenkins #2814] [Release 4.0.13] prepare release v4.0.13
8 years ago
WSO2 Builder 12febfd16f [WSO2 Release] [Jenkins #2812] [Release 4.0.12] prepare for next development iteration
8 years ago
WSO2 Builder 743328fae7 [WSO2 Release] [Jenkins #2812] [Release 4.0.12] prepare release v4.0.12
8 years ago
WSO2 Builder cd3eaac1e5 [WSO2 Release] [Jenkins #2810] [Release 4.0.11] prepare for next development iteration
8 years ago
WSO2 Builder 59c1bcebf6 [WSO2 Release] [Jenkins #2810] [Release 4.0.11] prepare release v4.0.11
8 years ago
WSO2 Builder a69c526e18 [WSO2 Release] [Jenkins #2807] [Release 4.0.10] prepare for next development iteration
8 years ago
WSO2 Builder 083aced742 [WSO2 Release] [Jenkins #2807] [Release 4.0.10] prepare release v4.0.10
8 years ago
WSO2 Builder d217b15cb6 [WSO2 Release] [Jenkins #2805] [Release 4.0.9] prepare for next development iteration
8 years ago
WSO2 Builder 3da6b3ff17 [WSO2 Release] [Jenkins #2805] [Release 4.0.9] prepare release v4.0.9
8 years ago
WSO2 Builder 306d7e7821 [maven-release-plugin]prepare for next development iteration
8 years ago
WSO2 Builder 86093d0234 [maven-release-plugin]prepare release v4.0.8
8 years ago
Madhawa Perera 558720e938 Merge pull request #720 from sinthuja/origin-wso2-master
8 years ago
sinthuja 91af23f1a8 Updating the source/target versions for 1.8.
8 years ago
WSO2 Builder 904d7a2439 [WSO2 Release] [Jenkins #2796] [Release 4.0.7] prepare for next development iteration
8 years ago
WSO2 Builder b3c6255799 [WSO2 Release] [Jenkins #2796] [Release 4.0.7] prepare release v4.0.7
8 years ago
WSO2 Builder 2bb08d04ff [WSO2 Release] [Jenkins #2794] [Release 4.0.6] prepare for next development iteration
8 years ago
WSO2 Builder ec798d6cee [WSO2 Release] [Jenkins #2794] [Release 4.0.6] prepare release v4.0.6
8 years ago
WSO2 Builder ad7b87917f [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare for next development iteration
8 years ago
WSO2 Builder 5888a5321a [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare release v4.0.5
8 years ago
ayyoob dc3420cadb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
sinthuja 39f45539c8 Merge pull request #700 from Nirothipan/master
8 years ago
Nirothipan e49e57beb3 formatting issue
8 years ago
Nirothipan 1f07327d69 Adding maven-jar-plugin
8 years ago
kamidu e8aa3631ec removing the snapshot versions
8 years ago
kamidu e39c2a1d8d Fixing Notification validation issue
8 years ago
ayyoob 6edc54b940 updated version
8 years ago
ayyoob 61a3455ec5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
ayyoob a983ae7c2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
ayyoob 276ccfc31a updated version
8 years ago
Harshan Liyanage 950f0fd952 Fixed missing maven property issue.
8 years ago
Harshan Liyanage 1ee97d7f93 Updated device-mgt-core version.
8 years ago
Harshan Liyanage 1146acbb15 Updated device-mgt-core version.
8 years ago
WSO2 Builder 76a68034d1 [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare for next development iteration
8 years ago
WSO2 Builder 8a30ed71ee [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare release v4.0.4
8 years ago
WSO2 Builder b56771328f [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare for next development iteration
8 years ago
WSO2 Builder 3150193276 [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare release v4.0.3
8 years ago
WSO2 Builder 25de54d79d [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare for next development iteration
8 years ago
WSO2 Builder d5ca9bec5c [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare release v4.0.2
8 years ago
geethkokila 6b7ced5b61 Fixing the build failure
8 years ago
ayyoob d1500dcd6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
Rasika Perera 7b34fddf6e Updating version
8 years ago
Rasika Perera 13d777ff71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
8 years ago
ayyoob 7117fdeafc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
WSO2 Builder 428fabd043 [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare for next development iteration
8 years ago
WSO2 Builder 2e8fb5739b [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare release v4.0.1
8 years ago
WSO2 Builder a72dbe91ef [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare for next development iteration
8 years ago
WSO2 Builder 5be8ef0a50 [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare release v4.0.0
8 years ago
Harshan Liyanage b9fc119682 Updated device-mgt core version.
8 years ago
Harshan Liyanage 5fd839d536 Disabled javadoc generation.
8 years ago
ayyoob fd369d55de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
Rasika Perera 316f0221f0 Updating cdmf version
8 years ago
Rasika Perera cac3600070 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
8 years ago
WSO2 Builder 657178a829 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare for next development iteration
8 years ago
WSO2 Builder b6d9066cb6 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare release v3.0.42
8 years ago
Rasika Perera 4713448c4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
8 years ago
ayyoob 2afa84bfb4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
ayyoob b02bb79561 removed unused files
8 years ago
WSO2 Builder 266d49f812 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare for next development iteration
8 years ago
WSO2 Builder 8def362081 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare release v3.0.41
8 years ago
Janak Amarasena a57f7a24fc Update Carbon Device Management version
8 years ago
ayyoob 64107c3386 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
WSO2 Builder 8e29ae8cae [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare for next development iteration
8 years ago
WSO2 Builder 3a27834115 [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare release v3.0.40
8 years ago
WSO2 Builder b9ad0c9eed [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare for next development iteration
8 years ago
WSO2 Builder 6179ccc4fc [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare release v3.0.39
8 years ago
Rasika Perera 7aa2cfde67 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Rasika Perera f74c5cebb5 Updating carbon-device-mgt version
8 years ago
Rasika Perera 3570e62735 Removed duplicated dependencies
8 years ago
ayyoob 6242fde431 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
ayyoob 9dc836928c few changes on content transformation logic
8 years ago
WSO2 Builder d708765bda [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare for next development iteration
8 years ago
WSO2 Builder 4f9d50ca91 [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare release v3.0.38
8 years ago
Rasika Perera 185c1698e4 Updating carbon-device-mgt version
8 years ago
ayyoob a1fb2ed9c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
ayyoob 8381070bf6 Implemented Pull Notification Support
8 years ago
Rasika Perera 7b88ae13ba Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt-plugins
8 years ago
WSO2 Builder e7af2ee4a4 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare for next development iteration
8 years ago
WSO2 Builder dff15c5978 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare release v3.0.37
8 years ago
madhawap 614d1c2606 upgrade the carbon.devicemgt.version
8 years ago
ayyoob b32bf11c91 fixed multi tenant issues after testing thrift endpoint with multitenant
8 years ago
WSO2 Builder 84e12c7cca [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare for next development iteration
8 years ago
WSO2 Builder 400da8f05e [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare release v3.0.36
8 years ago
megala21 20f8708edb Fixing issues in virtual fire alarm
8 years ago
WSO2 Builder 9fcee2917f [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare for next development iteration
8 years ago
WSO2 Builder c0c002a34b [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare release v3.0.35
8 years ago
WSO2 Builder 2242a1169b [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare for next development iteration
8 years ago
WSO2 Builder 87bccbdf1c [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare release v3.0.34
8 years ago
ayyoob 0117db8d9f fixed issues related to analytics feature installation to DAS-3.1.0
8 years ago
WSO2 Builder f0a70d7f27 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration
8 years ago
WSO2 Builder 24460ebde1 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33
8 years ago
WSO2 Builder df7df6ffa6 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3cdec9843a [maven-release-plugin] prepare release v3.0.32
8 years ago
Amal Gunatilake 9c019992eb Disabling maven-source-plugin
8 years ago
Amal Gunatilake f5093774df Merge branch 'master' into master
8 years ago
Amal Gunatilake 738a6bfcd1 Updating carbon.devicemgt.version
8 years ago
WSO2 Builder 2db4069053 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration
8 years ago
WSO2 Builder 902d7e3cf2 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31
8 years ago
Amal Gunatilake ddc1e8bef4 Merge pull request #663 from janakamarasena/master
8 years ago
Janak Amarasena 477ff6faee Changed CDM version
8 years ago
WSO2 Builder e2becd3169 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration
8 years ago
WSO2 Builder 85c36c0ca8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30
8 years ago
WSO2 Builder c3fb32f3bc [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration
8 years ago
WSO2 Builder 1b0047c39f [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29
8 years ago
WSO2 Builder 99e587eb78 [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration
8 years ago
WSO2 Builder 9b8929a8cd [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28
8 years ago
WSO2 Builder 1a91d1ddc0 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration
8 years ago
WSO2 Builder 426a016c37 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27
8 years ago
WSO2 Builder dc4c32129a [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration
8 years ago
WSO2 Builder b1c6ae0e2c [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26
8 years ago
Charitha Goonetilleke 186b3e16e4 Merge pull request #653 from ruwany/master
8 years ago
Ace 2564f88951 Upgrading device-mgt version
8 years ago
Ace 27095b099d Merging cherrypicked commits from cloud-310 branch
8 years ago
WSO2 Builder 72fab84bf9 [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration
8 years ago
WSO2 Builder 5ff67af60a [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25
8 years ago
WSO2 Builder 4c0e505008 [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration
8 years ago
WSO2 Builder b653b4871d [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24
8 years ago
WSO2 Builder 7a2b64605f [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration
8 years ago
WSO2 Builder 908ee841e9 [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23
8 years ago
WSO2 Builder 84220e2c25 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare for next development iteration
8 years ago
WSO2 Builder 5da8bf98b8 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22
8 years ago
kamidu bcdd78ae68 Merge branch 'master' into cloud-3.1.0
8 years ago
Harshan Liyanage 36946f7267 Updated device-mgt version
8 years ago
Kamidu Sachith Punchihewa 8f169d0116 Revert "Updated device-mgt version & interface."
8 years ago
Harshan Liyanage ff5a1c9c5d Updated device-mgt version & interface.
8 years ago
WSO2 Builder 2cf8496351 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare for next development iteration
8 years ago
WSO2 Builder 7d6def8976 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21
8 years ago
WSO2 Builder de5f854367 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare for next development iteration
8 years ago
WSO2 Builder 13cbce1e37 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20
8 years ago
WSO2 Builder 0f3318e353 [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare for next development iteration
8 years ago
WSO2 Builder 41041f3f6d [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19
8 years ago
WSO2 Builder cf3d543fea [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration
8 years ago
WSO2 Builder 59194a1286 [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18
8 years ago
WSO2 Builder 82ac8417d3 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration
8 years ago
WSO2 Builder d0e9362ee1 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17
8 years ago
WSO2 Builder 2049e44319 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration
8 years ago
WSO2 Builder d15dc25c13 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16
8 years ago
WSO2 Builder 8df6e56f40 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration
8 years ago
WSO2 Builder 2e8f5a63d2 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15
8 years ago
megala21 c8f25a0b77 Updating json version
8 years ago
WSO2 Builder c49b33bb4a [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration
8 years ago
WSO2 Builder e1064dca07 [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14
8 years ago
WSO2 Builder 68f329cbda [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration
8 years ago
WSO2 Builder 8669d1b44e [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13
8 years ago
WSO2 Builder 18d3518236 [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration
8 years ago
WSO2 Builder 867790d3cb [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12
8 years ago
Susinda 842c47c762 removing commented code, tetsing build fix and CI/CD
8 years ago
Susinda a8fe06524e removing commented code, tetsing build fix and CI/CD
8 years ago
Susinda 4f52439092 Fixing build failure - using 22 version
8 years ago
Susinda b5036f3d4b carbon.devicemgt.version increment to 2.0.23-SNAPSHOT
8 years ago
Susinda 4ebce9687d carbon.devicemgt.version dependency version chnaged to 2.0.22-SNAPSHOT
8 years ago
Susinda Perera fb6cfb6699 Merge pull request #1 from susinda/cloud-3.1.0
8 years ago
ayyoob 2dd7f53489 added log support for server to server communication
8 years ago
Susinda 66d2f32a4d carbon-device-mgt version changed to 2.0.20-SNAPSHOT
8 years ago
lakshani d6a99bfe1d adding commits edb8e71ac2 and 3c349a71e6 from lakshani
8 years ago
ayyoob facadb13b2 added mutual authenticator
8 years ago
Kamidu Sachith Punchihewa 68b36babe6 Merge pull request #575 from wso2/master
8 years ago
ayyoob 56de095599 resolved app connector build slowness issue
8 years ago
WSO2 Builder d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration
8 years ago
WSO2 Builder 1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11
8 years ago
ayyoob e0f6e9579d fixed multi tenant issues after testing
8 years ago
Milan Perera 99782e6360 Resolved conflicts and merged
8 years ago
Milan Perera e1a419425e Added cloud agent to the download page
8 years ago
WSO2 Builder 7034dae2b5 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder a2224f96ff [maven-release-plugin] prepare release v3.0.10
8 years ago
lakshani 8f53a05962 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
lakshani fff1a3f168 fixed the issues in rest connector
8 years ago
WSO2 Builder 4554d8929d [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration
8 years ago
WSO2 Builder da7c040224 [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9
8 years ago
lakshani d6b6da9c14 added rest-connector
8 years ago
Ayyoob Hamza 079c50c83d Merge pull request #562 from ayyoob/release-3.0.x
8 years ago
GPrathap 0cdc391ca1 updated to release version: carbon-device -mgt
8 years ago
ayyoob 4f1f1a3e7e Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
ayyoob caccc557f0 removed cdmc dependency from core
8 years ago
Rasika Perera 2c7c8e9542 Updated cdmf version into [2.0.11-SNAPSHOT]
8 years ago
Rasika Perera 7b3ecbeaab Updated cdmf into [2.0.10-SNAPSHOT]
8 years ago
WSO2 Builder e64fe695ab [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 5fbd40c579 [maven-release-plugin] prepare release v3.0.8
8 years ago
Rasika Perera 893e3d4017 Version bump [carbon.devicemgt.version] into [2.0.9]
8 years ago
Chatura Dilan b580827ced Bumping up appm version to 1.2.13
8 years ago
WSO2 Builder 9687362258 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ee063a1a43 [maven-release-plugin] prepare release v3.0.7
8 years ago
Rasika Perera da2d99f78e Version bumping cdmf into [2.0.8]
8 years ago
Rasika Perera 5c27cb9e6e Version bump on carbon.analytics.version into [1.3.3]
8 years ago
Chatura Dilan 60f7ffe09d Bumping appm version up
8 years ago
Rasika Perera 2639c90e50 Updating cdmf version into [2.0.8-SNAPSHOT]
8 years ago
WSO2 Builder 3f1b7a6005 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 91a0edb0a0 [maven-release-plugin] prepare release v3.0.6
8 years ago
Rasika Perera 780137574e Updating cdmf-core version into [2.0.7]
8 years ago
Rasika Perera 7351c36f9c Updating appm version into [1.2.10]
8 years ago
ayyoob 1df7d20a81 moved common configuration to global properties for input and output adapters
8 years ago
ayyoob 4cb6aca5b0 merge with upstream
8 years ago
WSO2 Builder b10579950b [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder b7a5454c2f [maven-release-plugin] prepare release v3.0.5
8 years ago
Rasika Perera 8c4dee7c2f Updating cdmf version into 2.0.6
8 years ago
ayyoob 2e8279b61a removed scep impl from virtual fire alarm
8 years ago
Milan Perera 68e7a0bf26 Updated APIM version
8 years ago
Milan Perera 8a384a6664 Updated to APIM latest snapshot version
8 years ago
Milan Perera 45162ac155 Fixed conflicts and merged
8 years ago