diff options
| author | Mohamed Ashraf <mohamed.ashraf.213@gmail.com> | 2013-08-07 03:01:43 +0400 |
|---|---|---|
| committer | Mohamed Ashraf <mohamed.ashraf.213@gmail.com> | 2013-08-07 03:05:48 +0400 |
| commit | 1bbb3816a8952659a42ab3f4b199d377e8e998fe (patch) | |
| tree | fa6b6b7a242a09dca68f0a3104333c1e291dce4d /.gitignore | |
| parent | babca95f9f32a1839a51fe050446a7ce783a95b0 (diff) | |
| parent | 66efad9f15dc11b7fe99250306b877b02e3acfcf (diff) | |
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
ChangeLog
libraries/Scripts.class.php
libraries/config.default.php
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 509c5a86dc..50b9eecdfe 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ phpmyadmin.wpj .idea .netbeans *.sw[op] +# IIS files +web.config # Locales /locale/ # Backups |