Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,22 @@ Pre-commit is configured to use the following tools for checking and formatting
- eslint
- prettier
- pyupgrade

#### Branches

Buzz is developed on two release lines:

| Branch | Line | What it is |
| --- | --- | --- |
| `main` | 1.x — stable | The supported release line, and what `bench get-app` installs by default. |
| `develop` | 2.x — beta | Where the next major lands, including team-based multi-tenancy. Not yet released. |

Open your pull request against `develop`. Once it is merged, add a `backport main`
label to cherry-pick it onto the stable line — the [backport
workflow](.github/workflows/backport.yml) opens the follow-up PR for you. Changes
that target 2.x only, such as anything building on teams, stay on `develop` and
should not be labelled.

### CI

This app can use GitHub Actions for CI. The following workflows are configured:
Expand Down
2 changes: 1 addition & 1 deletion buzz/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.0"
__version__ = "2.0.0-beta.0"

import os

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "buzz-frappe-app",
"version": "1.0.0",
"version": "2.0.0-beta.0",
"description": "Event Management App built on Frappe",
"main": "index.js",
"scripts": {
Expand Down
Loading