diff options
| author | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-29 16:00:51 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-29 16:00:51 -0800 |
| commit | c5cee53f2092ee2825095a1831ca47f1c41afc2f (patch) | |
| tree | 29c36f14668e67493b2c8ed98cb4d4124baf841e /docs/_layouts/global.html | |
| parent | 26186e2d259f3aa2db9c8594097fd342107ce147 (diff) | |
| parent | 3f74f729a190924b7634e08a381232af36aeb328 (diff) | |
| download | spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.tar.gz spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.tar.bz2 spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.zip | |
Merge remote-tracking branch 'origin/master' into python-api
Conflicts:
docs/quick-start.md
Diffstat (limited to 'docs/_layouts/global.html')
| -rwxr-xr-x | docs/_layouts/global.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html index 96eebd9f23..9804d449fc 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -35,7 +35,7 @@ <div class="navbar-inner"> <div class="container"> <div class="brand"><a href="index.html"> - <img src="../img/spark-logo-77x50px-hd.png" /></a><span class="version">{{site.SPARK_VERSION_SHORT}}</span> + <img src="img/spark-logo-77x50px-hd.png" /></a><span class="version">{{site.SPARK_VERSION_SHORT}}</span> </div> <ul class="nav"> <!--TODO(andyk): Add class="active" attribute to li some how.--> |