feature/battle-ready-mobile #7

Merged

mitch merged 2 commits from feature/battle-ready-mobile into master

2022-03-04 23:26:50 +00:00

Author	SHA1	Message	Date
mitch	97d5305e91	Merge branch 'master' into feature/battle-ready-mobile # Conflicts: # src/main/webapp/app/entities/force/force.component.html # src/main/webapp/app/entities/force/force.component.ts	2022-03-04 13:18:38 -05:00
vesem	d3670994dc	seperated desktop and mobile for force listing starting mobile version of force listing	2021-08-06 08:11:00 -04:00