Commit fd4a5f2
committed
Merge branch '3.4' into 4.2
* 3.4:
Show more accurate message in profiler when missing stopwatch
CS Fixes: Not double split with one array argument
Remove redundant animation prefixes
Remove redundant `box-sizing` prefixes
Rework firewall access denied rule
fixed CS
Fix missing $extraDirs when open_basedir returns1 file changed
+16
-22
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
851 | 851 | | |
852 | 852 | | |
853 | 853 | | |
854 | | - | |
855 | | - | |
856 | | - | |
857 | | - | |
858 | | - | |
859 | | - | |
860 | | - | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
861 | 859 | | |
862 | 860 | | |
863 | 861 | | |
| |||
1918 | 1916 | | |
1919 | 1917 | | |
1920 | 1918 | | |
1921 | | - | |
1922 | | - | |
1923 | | - | |
1924 | | - | |
1925 | | - | |
1926 | | - | |
1927 | | - | |
| 1919 | + | |
| 1920 | + | |
| 1921 | + | |
| 1922 | + | |
| 1923 | + | |
1928 | 1924 | | |
1929 | 1925 | | |
1930 | 1926 | | |
| |||
1964 | 1960 | | |
1965 | 1961 | | |
1966 | 1962 | | |
1967 | | - | |
1968 | | - | |
1969 | | - | |
| 1963 | + | |
| 1964 | + | |
| 1965 | + | |
1970 | 1966 | | |
1971 | | - | |
1972 | | - | |
1973 | | - | |
| 1967 | + | |
1974 | 1968 | | |
1975 | 1969 | | |
1976 | | - | |
1977 | | - | |
| 1970 | + | |
| 1971 | + | |
1978 | 1972 | | |
1979 | 1973 | | |
1980 | 1974 | | |
| |||
0 commit comments