Shao Yu-Lung (Allen) 55e2c6472e Merge branch 'master' into develop 4 gadi atpakaļ
..
.gitignore baf29b1223 re-added .gitignore for nginx dir, still do not want configs in git 8 gadi atpakaļ
app.conf.example 7219b3543a Nginx: added OpenSSL for local development (#1527) 6 gadi atpakaļ
confluence.conf.example 7ad82a3cd1 Added nginx settings for confluence 5 gadi atpakaļ
default.conf 7219b3543a Nginx: added OpenSSL for local development (#1527) 6 gadi atpakaļ
laravel.conf.example c6a8e5495d Add nginx example for nodejs 5 gadi atpakaļ
laravel_varnish.conf.example 2af7bfa60f Varnish vs Nginx configuration added 5 gadi atpakaļ
node.conf.example c6a8e5495d Add nginx example for nodejs 5 gadi atpakaļ
symfony.conf.example 7219b3543a Nginx: added OpenSSL for local development (#1527) 6 gadi atpakaļ