Commit dfea3e5
committed
Merge branch 'master' of https://github.com/serghey-rodin/vesta
# Conflicts:
# web/inc/i18n/fa.phpFile tree
5 files changed
+1028
-300
lines changed- bin
- web
- css
- inc/i18n
5 files changed
+1028
-300
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
54 | 60 | | |
55 | 61 | | |
56 | 62 | | |
| |||
File mode changed.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3123 | 3123 | | |
3124 | 3124 | | |
3125 | 3125 | | |
3126 | | - | |
| 3126 | + | |
3127 | 3127 | | |
3128 | 3128 | | |
3129 | 3129 | | |
3130 | 3130 | | |
3131 | 3131 | | |
3132 | 3132 | | |
| 3133 | + | |
3133 | 3134 | | |
3134 | 3135 | | |
3135 | 3136 | | |
| |||
0 commit comments