jekkos
|
174538f733
|
Merge with svn repository
Conflicts:
application/language/dutch/index.html
application/language/en/form_validation_lang.php
application/language/en/sales_lang.php
application/language/id/form_validation_lang.php
application/language/nl-BE/index.html
application/language/ru/form_validation_lang.php
application/views/config.php
system/language/Azərbaycanca/index.html
system/language/en/calendar_lang.php
system/language/en/date_lang.php
system/language/en/db_lang.php
system/language/en/email_lang.php
system/language/en/ftp_lang.php
system/language/en/imglib_lang.php
system/language/en/index.html
system/language/en/migration_lang.php
system/language/en/number_lang.php
system/language/en/profiler_lang.php
system/language/en/unit_test_lang.php
system/language/en/upload_lang.php
system/language/nl-BE/index.html
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@93 c3eb156b-1dc0-44e1-88ae-e38439141b53
|
2014-03-10 22:01:18 +00:00 |
|