Conflicts: src/main/resources/templates/admin/project_approve.ftl |
||
|---|---|---|
| gradle/wrapper | ||
| src/main | ||
| .gitignore | ||
| build.gradle | ||
| gradlew | ||
| gradlew.bat | ||
| settings.gradle | ||
Conflicts: src/main/resources/templates/admin/project_approve.ftl |
||
|---|---|---|
| gradle/wrapper | ||
| src/main | ||
| .gitignore | ||
| build.gradle | ||
| gradlew | ||
| gradlew.bat | ||
| settings.gradle | ||