removed conflict from languages, thanks Niphlod

This commit is contained in:
mdipierro
2013-12-01 10:00:05 -06:00
parent 77b66d6015
commit fa1c719c96
2 changed files with 1 additions and 5 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.8.2-stable+timestamp.2013.11.28.07.51.37
Version 2.8.2-stable+timestamp.2013.12.01.09.59.08