Merge branch 'master' of https://github.com/LordBeaver/infinity-squared

Browse Source

Conflicts:
	index.php
	result.php

...

This commit is contained in:

Tom Slominski

2015-03-01 20:06:24 +00:00

parent 4683e2bd3d ff9d158626

commit 26dea2e4c4

4 changed files with 21 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

public/languages/isq_translation-ru_RU.mo Normal file

Binary file not shown.