Merge branch 'master' into app-passwords
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> # Conflicts: # authentik/core/tests/test_source_flow_manager.py # authentik/stages/authenticator_validate/tests.py # authentik/stages/password/tests.py # scripts/generate_ci_config.py
This commit is contained in:
@ -90,6 +90,7 @@ export default [
|
||||
// Main Application
|
||||
{
|
||||
input: "./src/interfaces/AdminInterface.ts",
|
||||
context: "window",
|
||||
output: [
|
||||
{
|
||||
format: "es",
|
||||
@ -122,6 +123,7 @@ export default [
|
||||
// Flow executor
|
||||
{
|
||||
input: "./src/interfaces/FlowInterface.ts",
|
||||
context: "window",
|
||||
output: [
|
||||
{
|
||||
format: "es",
|
||||
|
||||
@ -27,7 +27,6 @@ export class ActionButton extends SpinnerButton {
|
||||
});
|
||||
});
|
||||
}
|
||||
throw e;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user