Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#113 AES savekey from xml to json #114

Merged
merged 2 commits into from
Oct 20, 2024
Merged

#113 AES savekey from xml to json #114

merged 2 commits into from
Oct 20, 2024

Conversation

maythamfahmi
Copy link
Collaborator

  • AES SaveKey from xml to json

@maythamfahmi maythamfahmi added enhancement New feature or request version3.0.0-preview001 CryptoNet Version 3 labels Oct 20, 2024
@maythamfahmi maythamfahmi self-assigned this Oct 20, 2024
@maythamfahmi maythamfahmi mentioned this pull request Oct 20, 2024
Closed
masterpeter2720
masterpeter2720 reviewed Oct 20, 2024
View reviewed changes
Copy link
Collaborator

@masterpeter2720 masterpeter2720 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the conflict

@maythamfahmi
Merge branch 'version3' into feature/#113-port-xml-to-json
e604aa9 
# Conflicts:
#	CryptoNet/CryptoNet.csproj
@maythamfahmi
Copy link
Collaborator Author

confligt fixed 😃

@maythamfahmi maythamfahmi merged commit 3380863 into version3 Oct 20, 2024
7 checks passed
@maythamfahmi maythamfahmi deleted the feature/#113-port-xml-to-json branch October 20, 2024 11:29
maythamfahmi added a commit that referenced this pull request Nov 3, 2024
@maythamfahmi @jwdonahue
Version3 (#125)
8adf313 
#84 
#85 
#86
#87
#96
#97 
#100
#101
#103
#104
#106
#107
#110
#111
#112 
#113
#114
#115
#120
#122

Authored-by: Maytham Fahmi <maythamfahmi@hotmail.com>
Co-authored-by: Joseph Donahue <joseph@odonahue.com>
Co-authored-by: Joseph W Donahue <joseph@sharperhacksllc.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@masterpeter2720 masterpeter2720 masterpeter2720 left review comments

@jwdonahue jwdonahue Awaiting requested review from jwdonahue

@Memhave Memhave Awaiting requested review from Memhave

Assignees

@maythamfahmi maythamfahmi

Labels
enhancement New feature or request version3.0.0-preview001 CryptoNet Version 3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maythamfahmi @masterpeter2720