Commit c58e902
committed
Merge remote-tracking branch 'origin/master' into Tigrov-patch-1
# Conflicts:
# _translations/po/es/guide_index.md.po
# _translations/po/es/guide_intro_upgrade-from-v2.md.po
# _translations/po/es/guide_intro_what-is-yii.md.po
# _translations/po/es/guide_runtime_logging.md.po
# _translations/po/es/guide_security_best-practices.md.po
# _translations/po/es/guide_start_databases.md.po
# _translations/po/es/guide_structure_application.md.po
# _translations/po/es/guide_tutorial_performance-tuning.md.po
# _translations/po/id/guide_index.md.po
# _translations/po/id/guide_intro_upgrade-from-v2.md.po
# _translations/po/id/guide_intro_what-is-yii.md.po
# _translations/po/id/guide_runtime_logging.md.po
# _translations/po/id/guide_security_best-practices.md.po
# _translations/po/id/guide_start_databases.md.po
# _translations/po/id/guide_structure_application.md.po
# _translations/po/id/guide_tutorial_performance-tuning.md.po
# _translations/po/ru/guide_index.md.po
# _translations/po/ru/guide_intro_upgrade-from-v2.md.po
# _translations/po/ru/guide_intro_what-is-yii.md.po
# _translations/po/ru/guide_runtime_logging.md.po
# _translations/po/ru/guide_security_best-practices.md.po
# _translations/po/ru/guide_start_databases.md.po
# _translations/po/ru/guide_structure_application.md.po
# _translations/po/ru/guide_tutorial_performance-tuning.md.po
# _translations/pot/guide_index.md.pot
# _translations/pot/guide_intro_upgrade-from-v2.md.pot
# _translations/pot/guide_intro_what-is-yii.md.pot
# _translations/pot/guide_runtime_logging.md.pot
# _translations/pot/guide_security_best-practices.md.pot
# _translations/pot/guide_start_databases.md.pot
# _translations/pot/guide_structure_application.md.pot
# _translations/pot/guide_tutorial_performance-tuning.md.potFile tree
36 files changed
+56
-56
lines changed- _translations
- pot
- po
- es
- id
- ru
- src
- es/guide/start
- guide/start
- id/guide/start
- ru/guide/start
36 files changed
+56
-56
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | | - | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| |||
449 | 449 | | |
450 | 450 | | |
451 | 451 | | |
452 | | - | |
453 | | - | |
| 452 | + | |
| 453 | + | |
454 | 454 | | |
455 | 455 | | |
456 | 456 | | |
| |||
462 | 462 | | |
463 | 463 | | |
464 | 464 | | |
465 | | - | |
466 | | - | |
| 465 | + | |
| 466 | + | |
467 | 467 | | |
468 | 468 | | |
469 | 469 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
0 commit comments