projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-10-16 08:13:22 -04:00
Code Issues Projects Releases Wiki Activity

Merge holocore/quality_assurance into cloning

Browse Source 
Conflicts:
	src/services/faction/FactionService.java
This commit is contained in:
Mads Boddum
2016-10-13 03:40:32 +02:00
parent cca8a0c725 f2535603f1
commit 291961eac0
18 changed files with 359 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/faction/FactionService.java
+1 -1
View File
@@ -266,4 +266,4 @@ public final class FactionService extends Service {
return pvpBitmask;
}
}
}