Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:GSA/digital-gov-drupal into feat…
Browse files Browse the repository at this point in the history
…ure/DIGITAL-119-configure-images

# Conflicts:
#	composer.lock
  • Loading branch information
cathybaptista committed Feb 6, 2025
2 parents 68b053b + 881e7a1 commit a3476f8
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 3 deletions.
52 changes: 51 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions composer.log
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ cd50d2b2b036edaa3a002881cf1b50ce|Ray Estrada|feature/DIGITAL-283-security-module
406c28be9e70355b9cfbbe1df58bb7ef|Ray Estrada|feature/DIGITAL-283-security-modules|Mon Jan 13 12:16:28 EST 2025|./composer.sh require drupal/database_ssl_check
699e8eda61efbe69e1f9a75fe81a3bf4|Oscar Merida|feature/DIGITAL-299-auto-headings|Tue Jan 14 14:23:14 EST 2025|./composer.sh require drupal/auto_heading_ids:^2.0@beta
c4f5d0dc96584bd1dc808fd112b6e516|Ray Estrada|feature/DIGITAL-252-community-review|Thu Jan 16 10:51:08 EST 2025|./composer.sh require drupal/svg_image
511e487e902df9d510dd82a84182db25|cathybaptista|feature/DIGITAL-119-configure-images|Thu Jan 30 17:07:59 EST 2025|./composer.sh require drupal/media_library_edit
857e71e647f08b694da43edfa1f80218|cathybaptista|feature/DIGITAL-119-configure-images|Thu Jan 30 17:08:26 EST 2025|./composer.sh require drupal/edit_media_modal
ce36fc2d9e87105d1ab7eda27ea9d434|Oscar Merida|develop|Mon Feb 3 14:30:03 EST 2025|./composer.sh require drupal/ckeditor_emoji
b2b17cbb32ac57e73928af9f52acb537|Oscar Merida|feature/DIGITAL-96-ckeditor-emoji|Mon Feb 3 15:14:17 EST 2025|./composer.sh require elvanto/litemoji
c73ec25d5b68a3e0e1bdfc83c24312ba|Matt Poole|feature/DIGITAL-396-update-deps-8-0|Wed Feb 5 15:32:16 EST 2025|./composer.sh update
d0ca998c567e8cc218ee57bb5c9b6679|cathybaptista|feature/DIGITAL-119-configure-images|Thu Feb 6 11:06:05 EST 2025|./composer.sh require drupal/media_library_edit
6b5963bf3c6740285c129be6d6273aed|cathybaptista|feature/DIGITAL-119-configure-images|Thu Feb 6 11:06:14 EST 2025|./composer.sh require drupal/edit_media_modal

0 comments on commit a3476f8

Please sign in to comment.