Bogdan Mart 7b0a09e84e Merge remote-tracking branch 'origin/main' into 1462-jwt-revocation-on-pwd-change ... * origin/main: revert Compose file version from 3.3 to 2.2 Adding more mem limits bump memory limit of iframely Remove extra category_id s . Fixes #1429 Fixing wrong user_ and community icon and banner urls. Remove category from activitypub context Adding a password length check to other API actions. (#1474) Update test script Use URL type in most outstanding struct fields (#1468) Forbid usage of unwrap Upgrade Rust version Rewrite settings implementation. Fixes #1270 (#1433) Rename `lemmy_structs` to `lemmy_api_structs` # Conflicts: # crates/db_schema/src/source/user.rs		2021-03-13 20:19:55 +02:00
..
src	Merge remote-tracking branch 'origin/main' into 1462-jwt-revocation-on-pwd-change	2021-03-13 20:19:55 +02:00
Cargo.toml	Use URL type in most outstanding struct fields (#1468)	2021-03-02 12:41:48 +00:00