-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1099 from focallocal/master
Merging Master into BTM to get it running with the new code. Note: this removes @Zahra-8d's changes which i've pulled out so they can be checked and re-added at a later time.
- Loading branch information
Showing
24 changed files
with
1,006 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,30 @@ | ||
{ | ||
"mongo_url": "ENC[AES256_GCM,data:ngePlBQ78PXPnoR2s7O0H62jMgUpTYdSe7VzmDbbHZeQt2QHUr24vEd7GDpIA1PrIs2l3Wed5tplQTAbyjv+vBs=,iv:o0VpCGFaKBU3ilcDILFq2L9rscIT0G9/Rnl4zNU1VWg=,tag:IWAQQf5ZrTP2/iTv+Ikejg==,type:str]", | ||
"mongo_url": "ENC[AES256_GCM,data:VgzbSkR7Tli7jDdZOmQ0wKLPFegg9sx7BtnI7y8Xr8nQQ0s9sxmZxzfgeT89e9vjh7YxsQh9P+77y8qMavCzNnp7egyQ+AwLPJx5QsGxuuWJh81FrvkNPkZoltEjPb9cJ5le55As,iv:QEyl4R2fMPlqQSIqkes9UxqVNvZnLr99nlHdoqrC6LM=,tag:xLFyaXhAYSilUfHdIprE9w==,type:str]", | ||
"sops": { | ||
"kms": null, | ||
"gcp_kms": null, | ||
"azure_kv": null, | ||
"lastmodified": "2020-04-05T12:30:32Z", | ||
"mac": "ENC[AES256_GCM,data:Ynjhgu3YtZLfDzpOYfg4UFDkbXI9Mq/PqcoTX1TbO6v4WXY4qYgrpNIRXX17QAhZyppwPUXsg4M+40aHSGqe7R2sHxaKTHcAUFDGZ8FZpP/BP563Z3rTo3aAILLKZHsqltPdqkW5XRyRwL5KrTta/OsGQVG4+JXW+xRTjbxs9NQ=,iv:FiIYIkvcLljDqah28kMVITuMX8RK8A1+MUUyYqYIXyI=,tag:4KjiWIkkNoviunlH/SxVMg==,type:str]", | ||
"hc_vault": null, | ||
"lastmodified": "2021-05-20T08:10:37Z", | ||
"mac": "ENC[AES256_GCM,data:Ms9jbodWL67uBznRpXzEot/HojKsewMeQ54UO0yn1lrYkqlPMBGr1LzYKk0HniRSlrlKnAPmEq4/OGKu8gD3ypjTP/ljlaudojKJxi6L8VuiA3bDoL7IlQSpCoL5FnYsHQmgBEsqijCA7qT1AWKtR1j1JKOGER7SfokmLhLC1YI=,iv:qDjAFidnx6sCHcXIWWcdybuo2D5nQ59bn7ZbGs0ULQM=,tag:xkMcs/NVS9h99nLziAbBCQ==,type:str]", | ||
"pgp": [ | ||
{ | ||
"created_at": "2020-04-05T12:30:28Z", | ||
"enc": "-----BEGIN PGP MESSAGE-----\n\nwcBMA9iKTJUod6vdAQgAeo9GFAA6mVpcedtZ4Sg5Dp5fIHgLx0RNd4x8KY2UwDiB\nN1ExeLXUyNLAjqKC67YMhn7CiP0iUTkwPy/a7YIoLYFoYQjT9DZ2qK/SRtIytvTJ\nNhEUbDTphsfP9EP8JFrgF+ZBFaOUEDvsxT5N3G7C2obisa1uetoxYZ+5cxBoqhif\nuBQGxdEdFdYo/g18E5EeyUGcqk6KDp74wmpRB1nhpOEwX/iTRlGVjGNlwCXnKt3O\n++T1hLTLbxzjq7mLBglWx7bMdu6lvA+Lbku97WnnUh5MDPmcLL8vqZEUZeX26n63\nXXPwyAdzctf5O3OZdRRCvzN/8g2KQfyoGR7gmtYWUNLgAeTGo57aYUAWQF5LA5+f\nkqkh4Q4E4LXgZ+HBUuBh4trA5Wfg6eXX9DyOOZvDnaWxTi6OU3h2VpeZMshjdZDp\naRWqZTFWPuAu5Ki8NVm3LYbg75ankBT5jcPi96WMxeEGpgA=\n=pROS\n-----END PGP MESSAGE-----", | ||
"fp": "CCE5435177838EBB3B0BBFC718E885F096A4A3F2" | ||
"created_at": "2021-05-20T08:10:35Z", | ||
"enc": "-----BEGIN PGP MESSAGE-----\n\nhQEMA5PCgedWIh8GAQf/c3i+33DWRwsVjsZp7KgToARYjFEC10n8X6RR4gp1OAoQ\npfA0yzlJVhl36v0NsrOdzhgeh/9nnM/OgR8AdqNTsz5Ntqunm1EogWYwUn/cJEOU\nj2wWQwWaAgF3bH3xrn/1y8gT8d+3Tc3zkrLB8PvpaW9om1IMwA9uvMd0XGbcEL9P\nAXPoMNMl5lq+2bJWzmtEzlN4659KrSDWBFeWkBGWxI4iYts+JPHApyjI6r7FWZp/\nUInDASZzl9pNYWQ6ux6oAJV0zKzUh02jDXqCRRL3ga7zXrxl9wZazVhH7Sl06slS\nCp3uQJ53QaaKCGxF0U1F+361CcwB8FHjODxpxwGYgtJeAX8ln1bUNEYoMvlW+U9/\nB+Jlnqy2qec9gSY9VkydHrrOvAvnPXLgol6fEefsDTTdCIac7/fZUtDwPH5SCH3g\nJ8UKuGv6fifQvLtyoEa3vIM8h2w8BmGFvPWPBBomeA==\n=etlf\n-----END PGP MESSAGE-----\n", | ||
"fp": "AC7E7C66AC708F04578DD0E293C281E756221F06" | ||
}, | ||
{ | ||
"created_at": "2020-04-05T12:30:28Z", | ||
"enc": "-----BEGIN PGP MESSAGE-----\n\nwcBMA5PCgedWIh8GAQgAje/saXBmhsnaJP7lpYx7SxlXJPXPPedQqfr/yFb7qEJF\nqLtARB7uJGyJw/hEOtUwLRFVdl/tv0/D3QvY89u2/HISOn2JRFpsXlhIXnem7kFu\nU8/HE1K9d+iVLz+HE62VX+1a8OgVYTDPYaS0fk13MC9uOJGjTny60bp5hA6i8D/X\n6henEUVJq7jlQRqjAH5dbrE9oWn86AXmLtBJkEQMRVjU6wb/c96PUNfDZQu5eTp9\nl4TWLpVUTLrgAt3jyMQuK9656Ga5Bz6G5WAVLw7UjBCb/xRL6n8c56EW+/e+lvb/\n2Xla8wBAOvq4OJ2gHyYg2/eGUE21pMAgOiezYdOwY9LgAeQhDbT7URS8aH4xMI46\nukkI4acE4GHgIuG9tOC94nILbZ3g9uWi97G6Gu6DE2ayp6kJpXGs+eMSlqd0s+mc\nEjlCjTOjCuAV5LlEa4ScutrAnhEIEGmsUKriMu1HbeHNqAA=\n=ZXr2\n-----END PGP MESSAGE-----", | ||
"fp": "AC7E7C66AC708F04578DD0E293C281E756221F06" | ||
"created_at": "2021-05-20T08:10:35Z", | ||
"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMAxAw3RVz8iZTAQ//ZcYlbGOA6F+6fEQ6UXVeMKk/aMMkXKQ8Ddi/IEsx/AI9\nXTnfWcrE/Diu7dl0tllSfFzD16KKzQTprz6bw3MfyX4ceeIbWE+NkIaZNWMf5Mpk\nEBTLJ2+o3q6MTuzTUpWo3ygnrOIDI8t8znETG+xBGzkidkK/OoE0SaQnkMfD9SDM\npyQWz6GK6OU4yfyWxrlYp9ieYvsc+BE5Hx27/YBgr6d1s8bRHLqGxQTCFlLvEqLf\naZez1tDOujN5gMpsmvL3rnXWVCOUWCXWXVahCw33OoVF02IXvt90E3aBXj9BQnxd\nwdmhnvuYcnKY4fXrnxI+g8djUl0mOnPk1BqJ+qYEbPS0aFNdfpotY9AGWTL/0z/1\nlkzyOJVIsfcdgNOTf1JuTCWX8uHrtljLPl6+OKoJj0hr/ock9ZEyxkakuRJzVLYe\n1s8DFKLnJfre6NR1sdKksPANXm3YCOZM7c60pWMVF4lsTege2IOuZk17HJpNUJ2U\nbVLTc/Mcghj7u6SzjoLy+I/dPRi36c5/W51gAgtewKdMeqzMdniGwEugBWzGzkpC\n1wqugoFU9JnqIh8VO32YBrWtwmiBVveEZR15e6SxucCefGdbC8yb8lSotW2kv5GB\nU57Xy82jQ4cYSk9UrvoQErX52U/n1ZUh18JauBLzDYYLyzyN25IJ/xwlQVsw47TS\nXgG9aggNo2aeQ/RIsYqkcwbpxUX+k4L9TgjZ39riaF6ky4H+wUQp+ITO6uh6rGV0\nv70nfLUljD1J5PJMAT4jDbghlGNXB9oBk/68tbhv8+6hn3TDzP26DoCVDOLqL4I=\n=kFAW\n-----END PGP MESSAGE-----\n", | ||
"fp": "840E6CCDC1624525E9EF8A4E07995D8B7A79AFE2" | ||
}, | ||
{ | ||
"created_at": "2021-05-20T08:10:35Z", | ||
"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DA2H7W1sR9ZESAQdAbmSVsMVFy6w3YVTpllgT6PQQrUIig3ntu+UN0bZ1sDww\ntjUVh68MhK3MpVHiZHPHuR6LSednQKq3yHldbEBnf//vUPSelmdGlifSqK5qhjbP\n0l4BqDkZARPG5jlCpfKFdvmivN+VfdzWIQUO/6yCxKrADg47uoF0AQD2h7+oGw5y\nORcx5oHyOxf4afLhJ1KU7tX3wgVOYo6i7BsWL+PbO1hqA8HPWikk0BHLSnvvjHM5\n=h7Wp\n-----END PGP MESSAGE-----\n", | ||
"fp": "45114EAAF0B75C9BEEDB075820A4FCFC521C4EEB" | ||
} | ||
], | ||
"unencrypted_suffix": "_unencrypted", | ||
"version": "3.5.0" | ||
"version": "3.6.1" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.