diff options
author | Simon Rettberg | 2017-04-27 13:46:42 +0200 |
---|---|---|
committer | Simon Rettberg | 2017-04-27 13:46:42 +0200 |
commit | 8666590dd1184970bf8c93415e49f8f4be43ea5b (patch) | |
tree | e9c0f1ba79b3400e98c6249daf61f8f519105f29 /.idea/php.xml | |
parent | [locationinfo] Clean up translations (diff) | |
parent | Relax anti-caching headers a bit (diff) | |
download | slx-admin-8666590dd1184970bf8c93415e49f8f4be43ea5b.tar.gz slx-admin-8666590dd1184970bf8c93415e49f8f4be43ea5b.tar.xz slx-admin-8666590dd1184970bf8c93415e49f8f4be43ea5b.zip |
Merge branch 'master' into location-info-panel
Diffstat (limited to '.idea/php.xml')
-rw-r--r-- | .idea/php.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 2a5958c5..00000000 --- a/.idea/php.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="PhpProjectSharedConfiguration" php_language_level="5.4.0" /> - <component name="PhpUnit"> - <phpunit_settings> - <PhpUnitSettings load_method="CUSTOM_LOADER" /> - </phpunit_settings> - </component> -</project>
\ No newline at end of file |