Skip to content

Commit

Permalink
Merge branch 'main' into temp/release-merge-1717719314
Browse files Browse the repository at this point in the history
  • Loading branch information
ashika112 authored Jun 7, 2024
2 parents da19d88 + 322cc48 commit e08b30e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: ['*']
pull_request:
branches: ['main', 'next/main', 'next/release']
branches: ['main', 'release', 'next/main', 'next/release']
schedule:
# Run every Tuesday at midnight GMT
- cron: '0 0 * * 2'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ concurrency:
on:
push:
branches:
- next/main
- replace-with-your-branch

jobs:
e2e:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Our default implementation works with Amazon Web Services (AWS), but AWS Amplify

#### Visit our [documentation site](https://docs.amplify.aws/) to learn more about AWS Amplify. Please see the [Amplify JavaScript](https://docs.amplify.aws/lib/q/platform/js/) page for information around the full list of features we support.

- [Demo Applications](https://github.com/aws-amplify/amplify-js-samples)
- [Contributing](https://github.com/aws-amplify/amplify-js/blob/main/CONTRIBUTING.md)

### Features
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

AWS Amplify is a JavaScript library for frontend and mobile developers building cloud-enabled applications. The library is a declarative interface across different categories of operations in order to make common tasks easier to add into your application. The default implementation works with Amazon Web Services (AWS) resources but is designed to be open and pluggable for usage with other cloud services that wish to provide an implementation or custom backends.

Documentation is available [here](https://docs.amplify.aws/lib/q/platform/js/).
Documentation is available [here](https://docs.amplify.aws/javascript/).

0 comments on commit e08b30e

Please sign in to comment.